diff --git a/Lib9c b/Lib9c
index 5c11d8044..f1d89f592 160000
--- a/Lib9c
+++ b/Lib9c
@@ -1 +1 @@
-Subproject commit 5c11d8044a93616ee7f34d49f2517241d7a5a6f6
+Subproject commit f1d89f5929e5f0b84e055a58a954bb57a0305f55
diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs
index 76db158cc..18af236b6 100644
--- a/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs
+++ b/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs
@@ -722,7 +722,7 @@ public async Task MonsterCollect()
                 }
             }";
 
-            ActionBase createAvatar = new CreateAvatar2
+            ActionBase createAvatar = new CreateAvatar
             {
                 index = 0,
                 hair = 0,
@@ -768,7 +768,7 @@ public async Task ClaimMonsterCollectionReward()
                 }}
             }}";
 
-            ActionBase createAvatar = new CreateAvatar2
+            ActionBase createAvatar = new CreateAvatar
             {
                 index = 0,
                 hair = 0,
diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs
index 3a2a5bb82..1f39c76c3 100644
--- a/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs
+++ b/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs
@@ -735,7 +735,7 @@ public async Task MonsterCollectionStatus_MonsterCollectionState_Null(bool miner
             {
                 StandaloneContextFx.NineChroniclesNodeService.MinerPrivateKey = null;
             }
-            var action = new CreateAvatar2
+            var action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,
@@ -786,7 +786,7 @@ public async Task Avatar()
             var service = MakeNineChroniclesNodeService(userPrivateKey);
             StandaloneContextFx.NineChroniclesNodeService = service;
             StandaloneContextFx.BlockChain = service.Swarm!.BlockChain;
-            var action = new CreateAvatar2
+            var action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,
@@ -806,7 +806,7 @@ public async Task Avatar()
             var avatarAddress = userAddress.Derive(
                 string.Format(
                     CultureInfo.InvariantCulture,
-                    CreateAvatar2.DeriveFormat,
+                    CreateAvatar.DeriveFormat,
                     0
                 )
             );
diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
index 03b40deb9..2ced502f2 100644
--- a/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
+++ b/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
@@ -90,7 +90,7 @@ public async Task SubscribeTx()
             var observable = stream.Take(1);
 
             var targetAction = new Grinding { AvatarAddress = new Address(), EquipmentIds = new List<Guid>() };
-            var nonTargetAction = new DailyReward6 { avatarAddress = new Address() };
+            var nonTargetAction = new DailyReward { avatarAddress = new Address() };
 
             Task<ExecutionResult> task = Task.Run(async () => await observable);
             var (block, transactions) = AppendBlock(targetAction, nonTargetAction);
diff --git a/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs
index 339c043c4..dc7d46b51 100644
--- a/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs
+++ b/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs
@@ -128,7 +128,7 @@ public async Task GetTx()
                 data
             );
 
-            var action = new CreateAvatar2
+            var action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,
@@ -165,7 +165,7 @@ public async Task CreateUnsignedTx(long? nonce)
             PublicKey publicKey = privateKey.PublicKey;
             Address signer = publicKey.Address;
             long expectedNonce = nonce ?? _blockChain.GetNextTxNonce(signer);
-            ActionBase action = new CreateAvatar2
+            ActionBase action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,