diff --git a/test/Admin.test.ts b/test/Admin.test.ts
index 400c00c..d9c60a5 100644
--- a/test/Admin.test.ts
+++ b/test/Admin.test.ts
@@ -89,7 +89,7 @@ describe("Admin", () => {
       await ctx.DODO.methods.disableBaseDeposit().send(ctx.sendParam(ctx.Supervisor))
       await assert.rejects(
         ctx.DODO.methods.depositBase(decimalStr("10")).send(ctx.sendParam(lp1)),
-        /DEPOSIT_BASE_TOKEN_NOT_ALLOWED/
+        /DEPOSIT_BASE_NOT_ALLOWED/
       )
 
       await ctx.DODO.methods.enableBaseDeposit().send(ctx.sendParam(ctx.Deployer))
@@ -99,7 +99,7 @@ describe("Admin", () => {
       await ctx.DODO.methods.disableQuoteDeposit().send(ctx.sendParam(ctx.Supervisor))
       await assert.rejects(
         ctx.DODO.methods.depositQuote(decimalStr("1000")).send(ctx.sendParam(lp1)),
-        /DEPOSIT_QUOTE_TOKEN_NOT_ALLOWED/
+        /DEPOSIT_QUOTE_NOT_ALLOWED/
       )
 
       await ctx.DODO.methods.enableQuoteDeposit().send(ctx.sendParam(ctx.Deployer))
@@ -227,7 +227,7 @@ describe("Admin", () => {
     it("final settlement revert cases", async () => {
       await assert.rejects(
         ctx.DODO.methods.claim().send(ctx.sendParam(lp1)),
-        /DODO_IS_NOT_CLOSED/
+        /DODO_NOT_CLOSED/
       )
       await ctx.DODO.methods.depositBase(decimalStr("10")).send(ctx.sendParam(lp1))
       await ctx.DODO.methods.depositQuote(decimalStr("500")).send(ctx.sendParam(lp2))
@@ -236,7 +236,7 @@ describe("Admin", () => {
       await ctx.DODO.methods.finalSettlement().send(ctx.sendParam(ctx.Deployer))
       await assert.rejects(
         ctx.DODO.methods.finalSettlement().send(ctx.sendParam(ctx.Deployer)),
-        / DODO_IS_CLOSED/
+        / DODO_CLOSED/
       )
 
       await ctx.DODO.methods.claim().send(ctx.sendParam(lp2))
@@ -247,15 +247,15 @@ describe("Admin", () => {
 
       await assert.rejects(
         ctx.DODO.methods.enableQuoteDeposit().send(ctx.sendParam(ctx.Deployer)),
-        /DODO_IS_CLOSED/
+        /DODO_CLOSED/
       )
       await assert.rejects(
         ctx.DODO.methods.enableBaseDeposit().send(ctx.sendParam(ctx.Deployer)),
-        /DODO_IS_CLOSED/
+        /DODO_CLOSED/
       )
       await assert.rejects(
         ctx.DODO.methods.enableTrading().send(ctx.sendParam(ctx.Deployer)),
-        /DODO_IS_CLOSED/
+        /DODO_CLOSED/
       )
     })
   })
@@ -318,22 +318,22 @@ describe("Admin", () => {
     it("k revert cases", async () => {
       await assert.rejects(
         ctx.DODO.methods.setK(decimalStr("1")).send(ctx.sendParam(ctx.Deployer)),
-        /K_MUST_BE_LESS_THAN_ONE/
+        /K>=1/
       )
       await assert.rejects(
         ctx.DODO.methods.setK(decimalStr("0")).send(ctx.sendParam(ctx.Deployer)),
-        /K_MUST_BE_GREATER_THAN_ZERO/
+        /K=0/
       )
     })
 
     it("fee revert cases", async () => {
       await assert.rejects(
         ctx.DODO.methods.setLiquidityProviderFeeRate(decimalStr("0.999")).send(ctx.sendParam(ctx.Deployer)),
-        /FEE_MUST_BE_LESS_THAN_ONE/
+        /FEE_RATE>=1/
       )
       await assert.rejects(
         ctx.DODO.methods.setMaintainerFeeRate(decimalStr("0.998")).send(ctx.sendParam(ctx.Deployer)),
-        /FEE_MUST_BE_LESS_THAN_ONE/
+        /FEE_RATE>=1/
       )
     })
   })
diff --git a/test/DODOZoo.test.ts b/test/DODOZoo.test.ts
index ce3ddd7..9ebf82f 100644
--- a/test/DODOZoo.test.ts
+++ b/test/DODOZoo.test.ts
@@ -34,12 +34,12 @@ describe("DODO ZOO", () => {
     it("could not deploy the same dodo", async () => {
       await assert.rejects(
         ctx.DODOZoo.methods.breedDODO(ctx.Supervisor, ctx.Maintainer, ctx.BASE.options.address, ctx.QUOTE.options.address, ctx.ORACLE.options.address, "0", "0", "1", "0").send(ctx.sendParam(ctx.Deployer)),
-        /DODO_IS_REGISTERED/
+        /DODO_REGISTERED/
       )
 
       await assert.rejects(
         ctx.DODOZoo.methods.breedDODO(ctx.Supervisor, ctx.Maintainer, ctx.QUOTE.options.address, ctx.BASE.options.address, ctx.ORACLE.options.address, "0", "0", "1", "0").send(ctx.sendParam(ctx.Deployer)),
-        /DODO_IS_REGISTERED/
+        /DODO_REGISTERED/
       )
     })
 
@@ -61,7 +61,7 @@ describe("DODO ZOO", () => {
       // could not init twice
       await assert.rejects(
         newDODO.methods.init(ctx.Supervisor, ctx.Maintainer, ctx.QUOTE.options.address, ctx.BASE.options.address, ctx.ORACLE.options.address, "0", "0", "1", "0").send(ctx.sendParam(ctx.Deployer)),
-        /DODO_ALREADY_INITIALIZED/
+        /DODO_INITIALIZED/
       )
     })
 
diff --git a/test/LiquidityProvider.test.ts b/test/LiquidityProvider.test.ts
index 95f7306..6a86353 100644
--- a/test/LiquidityProvider.test.ts
+++ b/test/LiquidityProvider.test.ts
@@ -351,12 +351,12 @@ describe("LiquidityProvider", () => {
 
       await assert.rejects(
         ctx.DODO.methods.withdrawBase(decimalStr("6")).send(ctx.sendParam(lp1)),
-        /DODO_BASE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_BASE_BALANCE_NOT_ENOUGH/
       )
 
       await assert.rejects(
         ctx.DODO.methods.withdrawAllBase().send(ctx.sendParam(lp1)),
-        /DODO_BASE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_BASE_BALANCE_NOT_ENOUGH/
       )
     })
 
@@ -366,12 +366,12 @@ describe("LiquidityProvider", () => {
 
       await assert.rejects(
         ctx.DODO.methods.withdrawQuote(decimalStr("600")).send(ctx.sendParam(lp1)),
-        /DODO_QUOTE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_QUOTE_BALANCE_NOT_ENOUGH/
       )
 
       await assert.rejects(
         ctx.DODO.methods.withdrawAllQuote().send(ctx.sendParam(lp1)),
-        /DODO_QUOTE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_QUOTE_BALANCE_NOT_ENOUGH/
       )
     })
 
@@ -381,12 +381,12 @@ describe("LiquidityProvider", () => {
 
       await assert.rejects(
         ctx.DODO.methods.withdrawBase(decimalStr("0.5")).send(ctx.sendParam(lp1)),
-        /COULD_NOT_AFFORD_LIQUIDITY_PENALTY/
+        /PENALTY_EXCEED/
       )
 
       await assert.rejects(
         ctx.DODO.methods.getWithdrawBasePenalty(decimalStr("10")).call(),
-        /DODO_BASE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_BASE_BALANCE_NOT_ENOUGH/
       )
     })
 
@@ -396,12 +396,12 @@ describe("LiquidityProvider", () => {
 
       await assert.rejects(
         ctx.DODO.methods.withdrawQuote(decimalStr("200")).send(ctx.sendParam(lp1)),
-        /COULD_NOT_AFFORD_LIQUIDITY_PENALTY/
+        /PENALTY_EXCEED/
       )
 
       await assert.rejects(
         ctx.DODO.methods.getWithdrawQuotePenalty(decimalStr("1000")).call(),
-        /DODO_QUOTE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_QUOTE_BALANCE_NOT_ENOUGH/
       )
     })
 
@@ -412,7 +412,7 @@ describe("LiquidityProvider", () => {
 
       await assert.rejects(
         ctx.DODO.methods.withdrawBase(decimalStr("0.5")).send(ctx.sendParam(lp2)),
-        /COULD_NOT_AFFORD_LIQUIDITY_PENALTY/
+        /PENALTY_EXCEED/
       )
     })
 
@@ -423,7 +423,7 @@ describe("LiquidityProvider", () => {
 
       await assert.rejects(
         ctx.DODO.methods.withdrawQuote(decimalStr("200")).send(ctx.sendParam(lp2)),
-        /COULD_NOT_AFFORD_LIQUIDITY_PENALTY/
+        /PENALTY_EXCEED/
       )
     })
 
diff --git a/test/StableCoinMode.test.ts b/test/StableCoinMode.test.ts
index 204a88f..b85a8ab 100644
--- a/test/StableCoinMode.test.ts
+++ b/test/StableCoinMode.test.ts
@@ -83,7 +83,7 @@ describe("Trader", () => {
       // could not buy all base balance
       await assert.rejects(
         ctx.DODO.methods.buyBaseToken(decimalStr("10000"), decimalStr("10010")).send(ctx.sendParam(trader)),
-        /DODO_BASE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_BASE_BALANCE_NOT_ENOUGH/
       )
 
       // when buy amount close to base balance, price will increase quickly
diff --git a/test/Trader.test.ts b/test/Trader.test.ts
index 58fcdb7..ae3b759 100644
--- a/test/Trader.test.ts
+++ b/test/Trader.test.ts
@@ -267,14 +267,14 @@ describe("Trader", () => {
     it("base balance limit", async () => {
       await assert.rejects(
         ctx.DODO.methods.buyBaseToken(decimalStr("11"), decimalStr("10000")).send(ctx.sendParam(trader)),
-        /DODO_BASE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_BASE_BALANCE_NOT_ENOUGH/
       )
 
       await ctx.DODO.methods.buyBaseToken(decimalStr("1"), decimalStr("200")).send(ctx.sendParam(trader))
 
       await assert.rejects(
         ctx.DODO.methods.buyBaseToken(decimalStr("11"), decimalStr("10000")).send(ctx.sendParam(trader)),
-        /DODO_BASE_TOKEN_BALANCE_NOT_ENOUGH/
+        /DODO_BASE_BALANCE_NOT_ENOUGH/
       )
     })
   })