cosmos · yangyanqing · Mar 13, 2019 · Mar 13, 2019 · Mar 13, 2019 · Mar 13, 2019
diff --git a/client/flags.go b/client/flags.go
@@ -80,8 +80,8 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command {
 		c.Flags().Uint64(FlagAccountNumber, 0, "AccountNumber number to sign the tx")
 		c.Flags().Uint64(FlagSequence, 0, "Sequence number to sign the tx")
 		c.Flags().String(FlagMemo, "", "Memo to send along with transaction")
-		c.Flags().String(FlagFees, "", "Fees to pay along with transaction; eg: 10stake,1atom")
-		c.Flags().String(FlagGasPrices, "", "Gas prices to determine the transaction fee (e.g. 0.00001stake)")
+		c.Flags().String(FlagFees, "", "Fees to pay along with transaction; eg: 10uatom,7foobar")
+		c.Flags().String(FlagGasPrices, "", "Gas prices to determine the transaction fee (e.g. 0.00001uatom)")
 		c.Flags().String(FlagNode, "tcp://localhost:26657", "<host>:<port> to tendermint rpc interface for this chain")
 		c.Flags().Bool(FlagUseLedger, false, "Use a connected Ledger device")
 		c.Flags().Float64(FlagGasAdjustment, DefaultGasAdjustment, "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored ")

diff --git a/client/lcd/swagger-ui/swagger.yaml b/client/lcd/swagger-ui/swagger.yaml
@@ -1744,7 +1744,7 @@ definitions:
     properties:
       denom:
         type: string
-        example: steak
+        example: uatom
       amount:
         type: string
         example: "50"

diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go
@@ -198,7 +198,7 @@ func InitClientHome(t *testing.T, dir string) string {
 // TODO: Make InitializeTestLCD safe to call in multiple tests at the same time
 // InitializeTestLCD starts Tendermint and the LCD in process, listening on
 // their respective sockets where nValidators is the total number of validators
-// and initAddrs are the accounts to initialize with some steak tokens. It
+// and initAddrs are the accounts to initialize with some uatom tokens. It
 // returns a cleanup function, a set of validator public keys, and a port.
 func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress, minting bool) (
 	cleanup func(), valConsPubKeys []crypto.PubKey, valOperAddrs []sdk.ValAddress, port string) {

diff --git a/cmd/gaia/app/sim_test.go b/cmd/gaia/app/sim_test.go
@@ -92,7 +92,7 @@ func appStateRandomizedFn(r *rand.Rand, accs []simulation.Account, genesisTimest
 		numInitiallyBonded = numAccs
 	}
 	fmt.Printf("Selected randomly generated parameters for simulated genesis:\n"+
-		"\t{amount of steak per account: %v, initially bonded validators: %v}\n",
+		"\t{amount of uatom per account: %v, initially bonded validators: %v}\n",
 		amount, numInitiallyBonded)
 
 	// randomly generate some genesis accounts

diff --git a/cmd/gaia/cli_test/README.md b/cmd/gaia/cli_test/README.md
@@ -36,7 +36,7 @@ This boilerplate above:
 - Ensures the tests run in parallel. Because the tests are calling out to `os/exec` for many operations these tests can take a long time to run.
 - Creates `.gaiad` and `.gaiacli` folders in a new temp folder.
 - Uses `gaiacli` to create 2 accounts for use in testing: `foo` and `bar`
-- Creates a genesis file with coins (`1000footoken,1000feetoken,150stake`) controlled by the `foo` key
+- Creates a genesis file with coins (`1000footoken,1000feetoken,150uatom`) controlled by the `foo` key
 - Generates an initial bonding transaction (`gentx`) to make the `foo` key a validator at genesis
 - Starts `gaiad` and stops it once the test exits
 - Cleans up test state on a successful run

diff --git a/cmd/gaia/cli_test/test_helpers.go b/cmd/gaia/cli_test/test_helpers.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	denom        = "stake"
+	denom        = "uatom"
 	keyFoo       = "foo"
 	keyBar       = "bar"
 	fooDenom     = "footoken"

diff --git a/cmd/gaia/init/genesis_accts_test.go b/cmd/gaia/init/genesis_accts_test.go
@@ -56,8 +56,8 @@ func TestAddGenesisAccount(t *testing.T) {
 			args{
 				app.GenesisState{},
 				addr1,
-				sdk.NewCoins(sdk.NewInt64Coin("stake", 50)),
-				sdk.NewCoins(sdk.NewInt64Coin("stake", 100)),
+				sdk.NewCoins(sdk.NewInt64Coin("uatom", 50)),
+				sdk.NewCoins(sdk.NewInt64Coin("uatom", 100)),
 				0,
 				0,
 			},
@@ -68,8 +68,8 @@ func TestAddGenesisAccount(t *testing.T) {
 			args{
 				app.GenesisState{},
 				addr1,
-				sdk.NewCoins(sdk.NewInt64Coin("stake", 50)),
-				sdk.NewCoins(sdk.NewInt64Coin("stake", 50)),
+				sdk.NewCoins(sdk.NewInt64Coin("uatom", 50)),
+				sdk.NewCoins(sdk.NewInt64Coin("uatom", 50)),
 				1654668078,
 				1554668078,
 			},

diff --git a/cmd/gaia/init/testnet.go b/cmd/gaia/init/testnet.go
@@ -85,7 +85,7 @@ Example:
 	)
 	cmd.Flags().String(
 		server.FlagMinGasPrices, fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom),
-		"Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001stake)",
+		"Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001uatom)",
 	)
 
 	return cmd

diff --git a/docs/gaia/deploy-testnet.md b/docs/gaia/deploy-testnet.md
@@ -44,7 +44,7 @@ gaiacli keys add validator
 # Add that key into the genesis.app_state.accounts array in the genesis file
 # NOTE: this command lets you set the number of coins. Make sure this account has some coins
 # with the genesis.app_state.staking.params.bond_denom denom, the default is staking
-gaiad add-genesis-account $(gaiacli keys show validator -a) 1000000000stake,1000000000validatortoken
+gaiad add-genesis-account $(gaiacli keys show validator -a) 1000000000uatom,1000000000validatortoken
 
 # Generate the transaction that creates your validator
 gaiad gentx --name validator

diff --git a/docs/spec/auth/01_concepts.md b/docs/spec/auth/01_concepts.md
@@ -15,7 +15,7 @@ signature verification, as well as costs proportional to the tx size. Operators
 should set minimum gas prices when starting their nodes. They must set the unit
 costs of gas in each token denomination they wish to support:
 
-`gaiad start ... --minimum-gas-prices=0.00001steak;0.05photinos`
+`gaiad start ... --minimum-gas-prices=0.00001uatom;0.05photinos`
 
 When adding transactions to mempool or gossipping transactions, validators check
 if the transaction's gas prices, which are determined by the provided fees, meet

diff --git a/docs/translations/cn/gaia/delegator-guide-cli.md b/docs/translations/cn/gaia/delegator-guide-cli.md
@@ -399,20 +399,20 @@ fees = gas * gasPrices
 
 ```bash
 // 向指定验证人绑定一定数量的Atom通证
-// 参数设定样例: <validatorAddress>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <amountToBound>=10000stake, <gasPrice>=0.001stake
+// 参数设定样例: <validatorAddress>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <amountToBound>=10000uatom, <gasPrice>=0.001uatom
 
 gaiacli tx staking delegate <validatorAddress> <amountToBond> --from <delegatorKeyName> --gas auto --gas-prices <gasPrice>
 
 
 // 提取所有的奖励
-// 参数设定样例: <gasPrice>=0.001stake 
+// 参数设定样例: <gasPrice>=0.001uatom 
 
 gaiacli tx distr withdraw-all-rewards --from <delegatorKeyName> --gas auto --gas-prices <gasPrice>
 
 
 // 向指定验证人申请解绑一定数量的Atom通证
 // 解绑的通证需要3周后才能完全解绑并可以交易，
-// 参数设定样例: <validatorAddress>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <amountToUnbound>=10000stake, <gasPrice>=0.001stake
+// 参数设定样例: <validatorAddress>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <amountToUnbound>=10000uatom, <gasPrice>=0.001uatom
 
 gaiacli tx staking unbond <validatorAddress> <amountToUnbond> --from <delegatorKeyName> --gas auto --gas-prices <gasPrice>
 ```
@@ -469,14 +469,14 @@ Cosmos Hub有一个内建的治理系统，该系统允许抵押通证的持有
 ```bash
 // 提交一个提案
 // <type>=text/parameter_change/software_upgrade
-// ex value for flag: <gasPrice>=0.0001stake
+// ex value for flag: <gasPrice>=0.0001uatom
 
-gaiacli tx gov submit-proposal --title "Test Proposal" --description "My awesome proposal" --type <type> --deposit=10stake --gas auto --gas-prices <gasPrice> --from <delegatorKeyName>
+gaiacli tx gov submit-proposal --title "Test Proposal" --description "My awesome proposal" --type <type> --deposit=10uatom --gas auto --gas-prices <gasPrice> --from <delegatorKeyName>
 
 // 增加对提案的抵押
 // Retrieve proposalID from $gaiacli query gov proposals --status deposit_period
 // 通过 $gaiacli query gov proposals --status deposit_period 命令获得 `proposalID` 
-// 参数设定样例: <deposit>=1stake
+// 参数设定样例: <deposit>=1uatom
 
 gaiacli tx gov deposit <proposalID> <deposit> --gas auto --gas-prices <gasPrice> --from <delegatorKeyName>
 
@@ -495,7 +495,7 @@ gaiacli tx gov vote <proposalID> <option> --gas auto --gas-prices <gasPrice> --f
 
 ```bash
 // 抵押Atom通证
-// 参数设定样例: <amountToBound>=10000stake, <bech32AddressOfValidator>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <gasPrice>=0.001stake
+// 参数设定样例: <amountToBound>=10000uatom, <bech32AddressOfValidator>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <gasPrice>=0.001uatom
 
 gaiacli tx staking delegate <validatorAddress> <amountToBond> --from <delegatorKeyName> --gas auto --gas-prices <gasPrice> --generate-only > unsignedTX.json
 ```

diff --git a/docs/translations/kr/gaia/delegator-guide-cli.md b/docs/translations/kr/gaia/delegator-guide-cli.md
@@ -309,7 +309,7 @@ gaiacli query
 
 ```bash
 // 아톰 위임하기 
-// 각 플래그 값 예시: <위임할 수량(amountToBound)> = 10000stake, <검증인의 bech32 주소(bech32AddressOfValidator)> = cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <가스 가격(gasPrice)> = 0.001stake
+// 각 플래그 값 예시: <위임할 수량(amountToBound)> = 10000uatom, <검증인의 bech32 주소(bech32AddressOfValidator)> = cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <가스 가격(gasPrice)> = 0.001uatom
 
 gaiacli tx staking --amount <위임할 수량(amountToBond)> --validator <검증인의 bech32 주소(bech32AddressOfValidator)> --from <위임자 키 명칭(delegatorKeyName)> --gas auto --gas-prices <가스 가격(gasPrice)>
 
@@ -379,13 +379,13 @@ gaiacli query tx <tx 해시값(txHash)>
 ```bash
 // 프로포절 제안하기
 // <프로포절 종류(type)>=text/parameter_change/software_upgrade
-// 플래그 값 예시: <가스 가격(gasPrice)>=0.0001stake
+// 플래그 값 예시: <가스 가격(gasPrice)>=0.0001uatom
 
-gaiacli tx gov submit-proposal --title "Test Proposal" --description "My awesome proposal" --type <프로포절 종류(type)> --deposit=10stake --gas auto --gas-prices <가스 가격(gasPrice)> --from <위임자 키 명칭(delegatorKeyName)>
+gaiacli tx gov submit-proposal --title "Test Proposal" --description "My awesome proposal" --type <프로포절 종류(type)> --deposit=10uatom --gas auto --gas-prices <가스 가격(gasPrice)> --from <위임자 키 명칭(delegatorKeyName)>
 
 // 프로포절의 예치금 추가하기
 // 프로포절의 proposalID 조회: $gaiacli query gov proposals --status deposit_period
-// 파라미터 값 예시: <예치금(deposit)>=1stake
+// 파라미터 값 예시: <예치금(deposit)>=1uatom
 
 gaiacli tx gov deposit <프로포절 ID(proposalID)> <추가할 예치금(deposit)> --gas auto --gas-prices <가스 가격(gasPrice)> --from <위임자 키 명칭(delegatorKeyName)>
 
@@ -402,7 +402,7 @@ gaiacli tx gov vote <프로포절 ID(proposalID)> <표 선택(option)> --gas aut
 
 ```bash
 // 아톰 본딩하기 
-// 플래그 값 예시: <본딩할 수량(amountToBond)>=10000stake, <위임할 검증인의 bech32 주소(bech32AddressOfValidator)>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <가스 가격(gasPrice)>=0.001stake
+// 플래그 값 예시: <본딩할 수량(amountToBond)>=10000uatom, <위임할 검증인의 bech32 주소(bech32AddressOfValidator)>=cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, <가스 가격(gasPrice)>=0.001uatom
 
 gaiacli tx staking --amount <본딩할 수량(amountToBond)> --validator <위임할 검증인의 bech32 주소(bech32AddressOfValidator)> --gas auto --gas-prices <가스 가격(gasPrice)> --generate-only > unsignedTX.json
 ```

diff --git a/docs/translations/kr/gaia/deploy-testnet.md b/docs/translations/kr/gaia/deploy-testnet.md
@@ -34,7 +34,7 @@ gaiacli keys add validator
 # Add that key into the genesis.app_state.accounts array in the genesis file
 # NOTE: this command lets you set the number of coins. Make sure this account has some coins
 # with the genesis.app_state.staking.params.bond_denom denom, the default is staking
-gaiad add-genesis-account $(gaiacli keys show validator -a) 1000stake,1000validatortoken
+gaiad add-genesis-account $(gaiacli keys show validator -a) 1000uatom,1000validatortoken
 
 # Generate the transaction that creates your validator
 gaiad gentx --name validator

diff --git a/docs/translations/kr/gaia/gaiacli.md b/docs/translations/kr/gaia/gaiacli.md
@@ -136,7 +136,7 @@ gaiacli tx send ... --fees=100photino
 또는
 
 ```bash
-gaiacli tx send ... --gas-prices=0.000001stake
+gaiacli tx send ... --gas-prices=0.000001uatom
 ```
 
 ### 계정
@@ -330,12 +330,12 @@ gaiacli query staking validator <account_cosmosval(cosmosval 계정)>
 
 #### 토큰 본딩하기
 
-테스트넷의 경우 `atom`이 아닌 `steak`를 위임합니다. 특정 테스트넷 검증인에게 토큰을 본딩하기 위해서는:
+테스트넷의 경우 `atom`이 아닌 `uatom`를 위임합니다. 특정 테스트넷 검증인에게 토큰을 본딩하기 위해서는:
 
 
 ```bash
 gaiacli tx staking delegate \
-  --amount=10steak \
+  --amount=10uatom \
   --validator=<validator(검증인 주소)> \
   --from=<key_name(트랜잭션을 발생할 키/계정 이름)> \
   --chain-id=<chain_id(체인 아이디)>
@@ -353,7 +353,7 @@ gaiacli keys show [name] --bech val
 
 
 ::: tip 참고
-보유하고 있는 `steak` 이상을 사용하지 마세요. `steak`가 더 필요한 경우 [Faucet](https://faucetcosmos.network/)에서 추가로 받으실 수 있습니다!
+보유하고 있는 `uatom` 이상을 사용하지 마세요. `uatom`가 더 필요한 경우 [Faucet](https://faucetcosmos.network/)에서 추가로 받으실 수 있습니다!
 :::
 
 ##### 위임 조회
@@ -515,7 +515,7 @@ gaiacli tx gov submit-proposal \
   --title=<title(프로포절 제목)> \
   --description=<description(프로포절 설명)> \
   --type=<Text/ParameterChange/SoftwareUpgrade(프로포절 타입)> \
-  --deposit=<40steak(예치금 수량)> \
+  --deposit=<40uatom(예치금 수량)> \
   --from=<name(트랜잭션을 발생시킬 키/계정 이름)> \
   --chain-id=<chain_id(체인 아이디)>
 ```
@@ -544,10 +544,10 @@ gaiacli query gov proposer <proposal_id(프로포절 ID)>
 
 #### 보증금 추가하기
 
-프로포절이 네트워크에 전파되기 위해서는 해당 프로포절의 보증금이 `minDeposit` 값 이상이어야 합니다 (현재 기본 값은 `10 steak`입니다). 만약 사전에 생성한 프로포절이 해당 기준을 충족하지 못하였다면 추후에 보증금을 추가 예치하여 활성화할 수 있습니다. 프로포절의 보증금이 최소 값을 도달하면 해당 프로포절의 투표는 활성화 됩니다:
+프로포절이 네트워크에 전파되기 위해서는 해당 프로포절의 보증금이 `minDeposit` 값 이상이어야 합니다 (현재 기본 값은 `10 uatom`입니다). 만약 사전에 생성한 프로포절이 해당 기준을 충족하지 못하였다면 추후에 보증금을 추가 예치하여 활성화할 수 있습니다. 프로포절의 보증금이 최소 값을 도달하면 해당 프로포절의 투표는 활성화 됩니다:
 
 ```bash
-gaiacli tx gov deposit <proposal_id(프로포절 ID)> <200steak(금액)> \
+gaiacli tx gov deposit <proposal_id(프로포절 ID)> <200uatom(금액)> \
   --from=<name(트랜잭션을 발생시킬 키/계정 이름)> \
   --chain-id=<chain_id(체인 아이디)>
 ```
@@ -688,7 +688,7 @@ gaiacli keys show --address p1p2p3
 위 주소를 기반으로 멀티시그 트랜잭션을 생성하는 과정의 첫 단계는 다음과 같습니다:
 
 ```bash
-gaiacli tx send cosmos1570v2fq3twt0f0x02vhxpuzc9jc4yl30q2qned 10stake \
+gaiacli tx send cosmos1570v2fq3twt0f0x02vhxpuzc9jc4yl30q2qned 10uatom \
   --from=<multisig_address(멀티시그 주소)> \
   --generate-only > unsignedTx.json
 ```

diff --git a/docs/translations/kr/gaia/ledger.md b/docs/translations/kr/gaia/ledger.md
@@ -24,7 +24,7 @@ NAME:	          TYPE:	  ADDRESS:						                                  PUBKEY:
 
 
 ```bash
-$ gaiacli tx send { .Destination.AccAddr } 10stake --from { .Key.Name } --chain-id=gaia-7000
+$ gaiacli tx send { .Destination.AccAddr } 10uatom --from { .Key.Name } --chain-id=gaia-7000
 ```
 
 레저 기기에서 해당 트랜잭션을 검토하신 후 서명이 되었다면 트랜잭션 결과를 레저 기기에서 확인하실 수 있습니다.
diff --git a/docs/translations/kr/gaia/validators/validator-setup.md b/docs/translations/kr/gaia/validators/validator-setup.md
@@ -36,7 +36,7 @@ gaiad tendermint show-validator
 
 ```bash
 gaiacli tx staking create-validator \
-  --amount=5STAKE \
+  --amount=5uatom \
   --pubkey=$(gaiad tendermint show-validator) \
   --moniker="choose a moniker" \
   --chain-id=<chain_id> \

diff --git a/server/config/config.go b/server/config/config.go
@@ -14,7 +14,7 @@ const (
 type BaseConfig struct {
 	// The minimum gas prices a validator is willing to accept for processing a
 	// transaction. A transaction's fees must meet the minimum of any denomination
-	// specified in this config (e.g. 0.01photino;0.0001stake).
+	// specified in this config (e.g. 0.01photino;0.0001uatom).
 	MinGasPrices string `mapstructure:"minimum-gas-prices"`
 }
 

diff --git a/server/config/toml.go b/server/config/toml.go
@@ -15,7 +15,7 @@ const defaultConfigTemplate = `# This is a TOML config file.
 
 # The minimum gas prices a validator is willing to accept for processing a
 # transaction. A transaction's fees must meet the minimum of any denomination
-# specified in this config (e.g. 0.01photino;0.0001stake).
+# specified in this config (e.g. 0.01photino;0.0001uatom).
 minimum-gas-prices = "{{ .BaseConfig.MinGasPrices }}"
 `
 

diff --git a/server/start.go b/server/start.go
@@ -51,7 +51,7 @@ func StartCmd(ctx *Context, appCreator AppCreator) *cobra.Command {
 	cmd.Flags().String(flagPruning, "syncable", "Pruning strategy: syncable, nothing, everything")
 	cmd.Flags().String(
 		FlagMinGasPrices, "",
-		"Minimum gas prices to accept for transactions; Any fee in a tx must meet this minimum (e.g. 0.01photino;0.0001stake)",
+		"Minimum gas prices to accept for transactions; Any fee in a tx must meet this minimum (e.g. 0.01photino;0.0001uatom)",
 	)
 
 	// add support for all Tendermint-specific command line options

diff --git a/types/coin_test.go b/types/coin_test.go
@@ -34,7 +34,7 @@ func TestIsEqualCoin(t *testing.T) {
 	}{
 		{NewInt64Coin(testDenom1, 1), NewInt64Coin(testDenom1, 1), true, false},
 		{NewInt64Coin(testDenom1, 1), NewInt64Coin(testDenom2, 1), false, true},
-		{NewInt64Coin("steak", 1), NewInt64Coin("steak", 10), false, false},
+		{NewInt64Coin("uatom", 1), NewInt64Coin("uatom", 10), false, false},
 	}
 
 	for tcIndex, tc := range cases {

diff --git a/types/dec_coin_test.go b/types/dec_coin_test.go
@@ -174,20 +174,20 @@ func TestParseDecCoins(t *testing.T) {
 		expectedErr    bool
 	}{
 		{"", nil, false},
-		{"4stake", nil, true},
-		{"5.5atom,4stake", nil, true},
-		{"0.0stake", nil, true},
-		{"0.004STAKE", nil, true},
+		{"4uatom", nil, true},
+		{"5.5atom,4uatom", nil, true},
+		{"0.0uatom", nil, true},
+		{"0.004UATOM", nil, true},
 		{
-			"0.004stake",
-			DecCoins{NewDecCoinFromDec("stake", NewDecWithPrec(4000000000000000, Precision))},
+			"0.004uatom",
+			DecCoins{NewDecCoinFromDec("uatom", NewDecWithPrec(4000000000000000, Precision))},
 			false,
 		},
 		{
-			"5.04atom,0.004stake",
+			"5.04atom,0.004uatom",
 			DecCoins{
 				NewDecCoinFromDec("atom", NewDecWithPrec(5040000000000000000, Precision)),
-				NewDecCoinFromDec("stake", NewDecWithPrec(4000000000000000, Precision)),
+				NewDecCoinFromDec("uatom", NewDecWithPrec(4000000000000000, Precision)),
 			},
 			false,
 		},
@@ -213,9 +213,9 @@ func TestDecCoinsString(t *testing.T) {
 		{
 			DecCoins{
 				NewDecCoinFromDec("atom", NewDecWithPrec(5040000000000000000, Precision)),
-				NewDecCoinFromDec("stake", NewDecWithPrec(4000000000000000, Precision)),
+				NewDecCoinFromDec("uatom", NewDecWithPrec(4000000000000000, Precision)),
 			},
-			"5.040000000000000000atom,0.004000000000000000stake",
+			"5.040000000000000000atom,0.004000000000000000uatom",
 		},
 	}
 
@@ -232,16 +232,16 @@ func TestDecCoinsIntersect(t *testing.T) {
 		expectedResult string
 	}{
 		{"", "", ""},
-		{"1.0stake", "", ""},
-		{"1.0stake", "1.0stake", "1.0stake"},
-		{"", "1.0stake", ""},
-		{"1.0stake", "", ""},
-		{"2.0stake,1.0trope", "1.9stake", "1.9stake"},
-		{"2.0stake,1.0trope", "2.1stake", "2.0stake"},
-		{"2.0stake,1.0trope", "0.9trope", "0.9trope"},
-		{"2.0stake,1.0trope", "1.9stake,0.9trope", "1.9stake,0.9trope"},
-		{"2.0stake,1.0trope", "1.9stake,0.9trope,20.0other", "1.9stake,0.9trope"},
-		{"2.0stake,1.0trope", "1.0other", ""},
+		{"1.0uatom", "", ""},
+		{"1.0uatom", "1.0uatom", "1.0uatom"},
+		{"", "1.0uatom", ""},
+		{"1.0uatom", "", ""},
+		{"2.0uatom,1.0trope", "1.9uatom", "1.9uatom"},
+		{"2.0uatom,1.0trope", "2.1uatom", "2.0uatom"},
+		{"2.0uatom,1.0trope", "0.9trope", "0.9trope"},
+		{"2.0uatom,1.0trope", "1.9uatom,0.9trope", "1.9uatom,0.9trope"},
+		{"2.0uatom,1.0trope", "1.9uatom,0.9trope,20.0other", "1.9uatom,0.9trope"},
+		{"2.0uatom,1.0trope", "1.0other", ""},
 	}
 
 	for i, tc := range testCases {