diff --git a/Makefile b/Makefile index 9357c59..4f65a06 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ help: @python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST) coverage: ## check code coverage - poetry run coverage run --source terra-classic_sdk -m pytest + poetry run coverage run --source terra_classic_sdk -m pytest poetry run coverage report -m poetry run coverage html # $(BROWSER) htmlcov/index.html @@ -54,11 +54,11 @@ clean-test: ## remove test and coverage artifacts rm -fr .pytest_cache test: ## runs tests - poetry run pytest --cov=terra-classic_sdk + poetry run pytest --cov=terra_classic_sdk qa: ## runs static analysis with mypy and flake8 - poetry run flake8 terra-classic_sdk - poetry run mypy -p terra-classic_sdk + poetry run flake8 terra_classic_sdk + poetry run mypy -p terra_classic_sdk format: ## runs code style and formatter poetry run isort . diff --git a/README.md b/README.md index 2f74b57..03539e6 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Terra SDK requires Python v3.7+. Terra SDK can be installed (preferably in a `virtual environment` from PyPI using `pip`) as follows: ``` -$ pip install -U terra-classic_sdk +$ pip install -U terra_classic_sdk ``` _You might have `pip3` installed instead of `pip`; proceed according to your own setup._ @@ -113,7 +113,7 @@ The following examples are provided to help you get started. Use cases and funct In order to interact with the Terra blockchain, you'll need a connection to a Terra node. This can be done through setting up an LCDClient (The LCDClient is an object representing an HTTP connection to a Terra LCD node.): ``` ->>> from terra-classic_sdk.client.lcd import LCDClient +>>> from terra_classic_sdk.client.lcd import LCDClient >>> terra = LCDClient(chain_id="columbus-5", url="https://lcd.terra.dev") ``` @@ -133,7 +133,7 @@ If you want to make asynchronous, non-blocking LCD requests, you can use AsyncLC 

 >>> import asyncio 
->>> from terra-classic_sdk.client.lcd import AsyncLCDClient
+>>> from terra_classic_sdk.client.lcd import AsyncLCDClient
 
 >>> async def main():
       terra = AsyncLCDClient("https://lcd.terra.dev", "columbus-5")
@@ -158,8 +158,8 @@ Use `LCDClient.wallet()` to create a Wallet from any Key instance. The Key provi
 **NOTE:** *If you are using MacOS and got an exception 'bad key length' from MnemonicKey, please check your python implementation. if `python3 -c "import ssl; print(ssl.OPENSSL_VERSION)"` returns LibreSSL 2.8.3, you need to reinstall python via pyenv or homebrew.*
 
 ```
->>> from terra-classic_sdk.client.lcd import LCDClient
->>> from terra-classic_sdk.key.mnemonic import MnemonicKey
+>>> from terra_classic_sdk.client.lcd import LCDClient
+>>> from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 >>> mk = MnemonicKey(mnemonic=MNEMONIC)
 >>> terra = LCDClient("https://lcd.terra.dev", "columbus-5")
@@ -169,9 +169,9 @@ Use `LCDClient.wallet()` to create a Wallet from any Key instance. The Key provi
 Once you have your Wallet, you can simply create a StdTx using `Wallet.create_and_sign_tx`.
 
 ```
->>> from terra-classic_sdk.core.fee import Fee
->>> from terra-classic_sdk.core.bank import MsgSend
->>> from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
+>>> from terra_classic_sdk.core.fee import Fee
+>>> from terra_classic_sdk.core.bank import MsgSend
+>>> from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
 
 >>> tx = wallet.create_and_sign_tx(CreateTxOptions(
         msgs=[MsgSend(
diff --git a/dist/.DS_Store b/dist/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/dist/.DS_Store differ
diff --git a/dist/terra_classic_sdk-2.0.7-py3-none-any.whl b/dist/terra_classic_sdk-2.0.7-py3-none-any.whl
new file mode 100644
index 0000000..1e3ff3a
Binary files /dev/null and b/dist/terra_classic_sdk-2.0.7-py3-none-any.whl differ
diff --git a/dist/terra_classic_sdk-2.0.7.tar.gz b/dist/terra_classic_sdk-2.0.7.tar.gz
new file mode 100644
index 0000000..96f88fd
Binary files /dev/null and b/dist/terra_classic_sdk-2.0.7.tar.gz differ
diff --git a/docs/common/bech32.rst b/docs/common/bech32.rst
index 35e70a8..27e6733 100644
--- a/docs/common/bech32.rst
+++ b/docs/common/bech32.rst
@@ -16,22 +16,22 @@ Addresses
 AccAddress
 ^^^^^^^^^^
 
-.. autoclass:: terra-classic_sdk.core.bech32.AccAddress
+.. autoclass:: terra_classic_sdk.core.bech32.AccAddress
     :members:
 
-.. autofunction:: terra-classic_sdk.core.bech32.is_acc_address
+.. autofunction:: terra_classic_sdk.core.bech32.is_acc_address
 
-.. autofunction:: terra-classic_sdk.core.bech32.to_acc_address
+.. autofunction:: terra_classic_sdk.core.bech32.to_acc_address
 
 ValAddress
 ^^^^^^^^^^
 
-.. autoclass:: terra-classic_sdk.core.bech32.ValAddress
+.. autoclass:: terra_classic_sdk.core.bech32.ValAddress
     :members:
 
-.. autofunction:: terra-classic_sdk.core.bech32.is_val_address
+.. autofunction:: terra_classic_sdk.core.bech32.is_val_address
 
-.. autofunction:: terra-classic_sdk.core.bech32.to_val_address
+.. autofunction:: terra_classic_sdk.core.bech32.to_val_address
 
 
 
@@ -41,20 +41,20 @@ PubKeys
 AccPubKey
 ^^^^^^^^^
 
-.. autoclass:: terra-classic_sdk.core.bech32.AccPubKey
+.. autoclass:: terra_classic_sdk.core.bech32.AccPubKey
     :members:
 
-.. autofunction:: terra-classic_sdk.core.bech32.is_acc_pubkey
+.. autofunction:: terra_classic_sdk.core.bech32.is_acc_pubkey
 
-.. autofunction:: terra-classic_sdk.core.bech32.to_acc_pubkey
+.. autofunction:: terra_classic_sdk.core.bech32.to_acc_pubkey
 
 ValPubKey
 ^^^^^^^^^
 
-.. autoclass:: terra-classic_sdk.core.bech32.ValPubKey
+.. autoclass:: terra_classic_sdk.core.bech32.ValPubKey
     :members:
 
-.. autofunction:: terra-classic_sdk.core.bech32.is_acc_pubkey
+.. autofunction:: terra_classic_sdk.core.bech32.is_acc_pubkey
 
-.. autofunction:: terra-classic_sdk.core.bech32.to_acc_pubkey
+.. autofunction:: terra_classic_sdk.core.bech32.to_acc_pubkey
 
diff --git a/docs/common/coin_coins.rst b/docs/common/coin_coins.rst
index b3205fd..ebc789c 100644
--- a/docs/common/coin_coins.rst
+++ b/docs/common/coin_coins.rst
@@ -4,12 +4,12 @@ Coin & Coins
 Coin
 ----
 
-.. autoclass:: terra-classic_sdk.core.coin.Coin
+.. autoclass:: terra_classic_sdk.core.coin.Coin
     :members:
 
 
 Coins
 -----
 
-.. autoclass:: terra-classic_sdk.core.coins.Coins
+.. autoclass:: terra_classic_sdk.core.coins.Coins
     :members:
diff --git a/docs/common/exceptions.rst b/docs/common/exceptions.rst
index f1c818b..ab6ce07 100644
--- a/docs/common/exceptions.rst
+++ b/docs/common/exceptions.rst
@@ -1,5 +1,5 @@
 Exceptions
 ==========
 
-.. automodule:: terra-classic_sdk.exceptions
+.. automodule:: terra_classic_sdk.exceptions
     :members:
\ No newline at end of file
diff --git a/docs/common/keys_wallet.rst b/docs/common/keys_wallet.rst
index a1637c5..a245a7d 100644
--- a/docs/common/keys_wallet.rst
+++ b/docs/common/keys_wallet.rst
@@ -6,31 +6,31 @@ A **Key** is an object that provides an abstraction for the agency of signing tr
 Key (abstract)
 --------------
 
-Implementers of Keys meant for signing should override :meth:`Key.sign()`
-or :meth:`Key.create_signature()` methods. More details are
+Implementers of Keys meant for signing should override :meth:`Key.sign()`
+or :meth:`Key.create_signature()` methods. More details are
 available in :ref:`guides/custom_key`.
 
-Some properties such as :meth:`acc_address` and
-:meth:`val_address` are provided.
+Some properties such as :meth:`acc_address` and
+:meth:`val_address` are provided.
 
-.. automodule:: terra-classic_sdk.key.key
+.. automodule:: terra_classic_sdk.key.key
     :members:
 
 RawKey
 ------
 
-.. automodule:: terra-classic_sdk.key.raw
+.. automodule:: terra_classic_sdk.key.raw
     :members:
 
 
 MnemonicKey
 -----------
 
-.. automodule:: terra-classic_sdk.key.mnemonic
+.. automodule:: terra_classic_sdk.key.mnemonic
     :members:
 
 Wallet
 ------
 
-.. automodule:: terra-classic_sdk.client.lcd.wallet
+.. automodule:: terra_classic_sdk.client.lcd.wallet
     :members:
\ No newline at end of file
diff --git a/docs/common/numeric.rst b/docs/common/numeric.rst
index ef6fb9e..a2aac78 100644
--- a/docs/common/numeric.rst
+++ b/docs/common/numeric.rst
@@ -3,7 +3,7 @@
 Numeric Types
 =============
 
-.. autoclass:: terra-classic_sdk.core.numeric.Numeric
+.. autoclass:: terra_classic_sdk.core.numeric.Numeric
     :members:
 
 Integers
@@ -21,5 +21,5 @@ The Python's ``int`` provides support for BigNumber implementation for artihmeti
 Decimals
 --------
 
-.. autoclass:: terra-classic_sdk.core.Dec
+.. autoclass:: terra_classic_sdk.core.Dec
     :members:
diff --git a/docs/core_modules/auth.rst b/docs/core_modules/auth.rst
index feb81e7..f539e4a 100644
--- a/docs/core_modules/auth.rst
+++ b/docs/core_modules/auth.rst
@@ -1,12 +1,12 @@
 Auth
 ====
 
-.. note:: Data objects are also aliased under at ``terra-classic_sdk.core.auth``.
+.. note:: Data objects are also aliased under at ``terra_classic_sdk.core.auth``.
 
 API
 --------
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.auth.AuthAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.auth.AuthAPI
     :members:
 
 
@@ -16,17 +16,17 @@ Data
 Account
 ^^^^^^^
 
-.. automodule:: terra-classic_sdk.core.auth.data.account
+.. automodule:: terra_classic_sdk.core.auth.data.account
     :members:
 
 Transactions
 ^^^^^^^^^^^^
 
-.. automodule:: terra-classic_sdk.core.tx
+.. automodule:: terra_classic_sdk.core.tx
     :members:
 
 Public Key
 ^^^^^^^^^^
 
-.. automodule:: terra-classic_sdk.core.public_key
+.. automodule:: terra_classic_sdk.core.public_key
     :members:
diff --git a/docs/core_modules/authz.rst b/docs/core_modules/authz.rst
index b4f3f84..2de3522 100644
--- a/docs/core_modules/authz.rst
+++ b/docs/core_modules/authz.rst
@@ -4,17 +4,17 @@ Authz
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.authz.AuthzAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.authz.AuthzAPI
     :members: 
 
 Data
 ----
 
-.. automodule:: terra-classic_sdk.core.authz.data
+.. automodule:: terra_classic_sdk.core.authz.data
     :members:
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.authz.msgs
+.. automodule:: terra_classic_sdk.core.authz.msgs
     :members:
diff --git a/docs/core_modules/bank.rst b/docs/core_modules/bank.rst
index 9d652b3..b1dfa85 100644
--- a/docs/core_modules/bank.rst
+++ b/docs/core_modules/bank.rst
@@ -4,11 +4,11 @@ Bank
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.bank.BankAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.bank.BankAPI
     :members: 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.bank.msgs
+.. automodule:: terra_classic_sdk.core.bank.msgs
     :members:
\ No newline at end of file
diff --git a/docs/core_modules/crisis.rst b/docs/core_modules/crisis.rst
index 476a0c5..ef7e244 100644
--- a/docs/core_modules/crisis.rst
+++ b/docs/core_modules/crisis.rst
@@ -4,5 +4,5 @@ Crisis
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.crisis.msgs
+.. automodule:: terra_classic_sdk.core.crisis.msgs
     :members:
diff --git a/docs/core_modules/distribution.rst b/docs/core_modules/distribution.rst
index 65db904..5ae2c07 100644
--- a/docs/core_modules/distribution.rst
+++ b/docs/core_modules/distribution.rst
@@ -4,23 +4,23 @@ Distribution
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.distribution.DistributionAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.distribution.DistributionAPI
     :members: 
 
 Data
 ----
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.distribution.Rewards
+.. autoclass:: terra_classic_sdk.client.lcd.api.distribution.Rewards
     :members: 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.distribution.msgs
+.. automodule:: terra_classic_sdk.core.distribution.msgs
     :members:
 
 Proposals
 ---------
 
-.. automodule:: terra-classic_sdk.core.distribution.proposals
+.. automodule:: terra_classic_sdk.core.distribution.proposals
     :members:
diff --git a/docs/core_modules/gov.rst b/docs/core_modules/gov.rst
index 4bb4377..1ad29ec 100644
--- a/docs/core_modules/gov.rst
+++ b/docs/core_modules/gov.rst
@@ -4,23 +4,23 @@ Gov
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.gov.GovAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.gov.GovAPI
     :members: 
 
 Data
 ----
 
-.. automodule:: terra-classic_sdk.core.gov.data
+.. automodule:: terra_classic_sdk.core.gov.data
     :members:
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.gov.msgs
+.. automodule:: terra_classic_sdk.core.gov.msgs
     :members:
 
 Proposals
 ---------
 
-.. automodule:: terra-classic_sdk.core.gov.proposals
+.. automodule:: terra_classic_sdk.core.gov.proposals
     :members:
\ No newline at end of file
diff --git a/docs/core_modules/ibc_transfer.rst b/docs/core_modules/ibc_transfer.rst
index ae01779..f5666d3 100644
--- a/docs/core_modules/ibc_transfer.rst
+++ b/docs/core_modules/ibc_transfer.rst
@@ -4,12 +4,12 @@ IBC-Transfer
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.ibc_transfer.IbcTransferAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.ibc_transfer.IbcTransferAPI
     :members: 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.ibc_transfer.msgs
+.. automodule:: terra_classic_sdk.core.ibc_transfer.msgs
     :members:
     :exclude-members: b64_to_dict, dict_to_b64
diff --git a/docs/core_modules/market.rst b/docs/core_modules/market.rst
index 49aae54..340b6ab 100644
--- a/docs/core_modules/market.rst
+++ b/docs/core_modules/market.rst
@@ -4,11 +4,11 @@ Market
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.market.MarketAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.market.MarketAPI
     :members: 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.market.msgs
+.. automodule:: terra_classic_sdk.core.market.msgs
     :members:
diff --git a/docs/core_modules/mint.rst b/docs/core_modules/mint.rst
index 2572b00..568d033 100644
--- a/docs/core_modules/mint.rst
+++ b/docs/core_modules/mint.rst
@@ -4,5 +4,5 @@ Mint
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.mint.MintAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.mint.MintAPI
     :members: 
diff --git a/docs/core_modules/oracle.rst b/docs/core_modules/oracle.rst
index 6f34958..a424cd3 100644
--- a/docs/core_modules/oracle.rst
+++ b/docs/core_modules/oracle.rst
@@ -4,25 +4,25 @@ Oracle
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.oracle.OracleAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.oracle.OracleAPI
     :members: 
 
 Data
 ----
 
-.. automodule:: terra-classic_sdk.core.oracle.data
+.. automodule:: terra_classic_sdk.core.oracle.data
     :members:
 
 Functions
 ---------
 
-.. autofunction:: terra-classic_sdk.core.oracle.msgs.vote_hash
-.. autofunction:: terra-classic_sdk.core.oracle.msgs.aggregate_vote_hash
+.. autofunction:: terra_classic_sdk.core.oracle.msgs.vote_hash
+.. autofunction:: terra_classic_sdk.core.oracle.msgs.aggregate_vote_hash
 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.oracle.msgs
+.. automodule:: terra_classic_sdk.core.oracle.msgs
     :members:
     :exclude-members: vote_hash, aggregate_vote_hash
diff --git a/docs/core_modules/params.rst b/docs/core_modules/params.rst
index 3e58727..2b8de86 100644
--- a/docs/core_modules/params.rst
+++ b/docs/core_modules/params.rst
@@ -4,5 +4,5 @@ Params
 Proposals
 ---------
 
-.. automodule:: terra-classic_sdk.core.params.proposals
+.. automodule:: terra_classic_sdk.core.params.proposals
     :members:
diff --git a/docs/core_modules/slashing.rst b/docs/core_modules/slashing.rst
index 97e51f0..88b5862 100644
--- a/docs/core_modules/slashing.rst
+++ b/docs/core_modules/slashing.rst
@@ -4,11 +4,11 @@ Slashing
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.slashing.SlashingAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.slashing.SlashingAPI
     :members: 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.slashing.msgs
+.. automodule:: terra_classic_sdk.core.slashing.msgs
     :members:
diff --git a/docs/core_modules/staking.rst b/docs/core_modules/staking.rst
index 45bb0bf..bef326b 100644
--- a/docs/core_modules/staking.rst
+++ b/docs/core_modules/staking.rst
@@ -4,7 +4,7 @@ Staking
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.staking.StakingAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.staking.StakingAPI
     :members: 
 
 Data
@@ -13,18 +13,18 @@ Data
 Delegation
 ^^^^^^^^^^
 
-.. automodule:: terra-classic_sdk.core.staking.data.delegation
+.. automodule:: terra_classic_sdk.core.staking.data.delegation
     :members:
 
 Validator
 ^^^^^^^^^
 
-.. automodule:: terra-classic_sdk.core.staking.data.validator
+.. automodule:: terra_classic_sdk.core.staking.data.validator
     :members:
 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.staking.msgs
+.. automodule:: terra_classic_sdk.core.staking.msgs
     :members:
diff --git a/docs/core_modules/tendermint.rst b/docs/core_modules/tendermint.rst
index 1b4f63c..40daaf1 100644
--- a/docs/core_modules/tendermint.rst
+++ b/docs/core_modules/tendermint.rst
@@ -4,5 +4,5 @@ Tendermint
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.tendermint.TendermintAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.tendermint.TendermintAPI
     :members: 
diff --git a/docs/core_modules/tx.rst b/docs/core_modules/tx.rst
index df2ea87..3909016 100644
--- a/docs/core_modules/tx.rst
+++ b/docs/core_modules/tx.rst
@@ -4,17 +4,17 @@ Transactions
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.tx.TxAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.tx.TxAPI
     :members:
 
 Functions
 ---------
 
-.. autofunction:: terra-classic_sdk.core.broadcast.is_tx_error
+.. autofunction:: terra_classic_sdk.core.broadcast.is_tx_error
 
 Data
 ----
 
-.. automodule:: terra-classic_sdk.core.broadcast
+.. automodule:: terra_classic_sdk.core.broadcast
     :members:
     :exclude-members: is_tx_error
\ No newline at end of file
diff --git a/docs/core_modules/wasm.rst b/docs/core_modules/wasm.rst
index ff0d240..0f195b6 100644
--- a/docs/core_modules/wasm.rst
+++ b/docs/core_modules/wasm.rst
@@ -4,11 +4,11 @@ WebAssembly
 API
 ---
 
-.. autoclass:: terra-classic_sdk.client.lcd.api.wasm.WasmAPI
+.. autoclass:: terra_classic_sdk.client.lcd.api.wasm.WasmAPI
     :members: 
 
 Messages
 --------
 
-.. automodule:: terra-classic_sdk.core.wasm.msgs
+.. automodule:: terra_classic_sdk.core.wasm.msgs
     :members:
diff --git a/docs/guides/async.rst b/docs/guides/async.rst
index 737accf..be8c394 100644
--- a/docs/guides/async.rst
+++ b/docs/guides/async.rst
@@ -13,7 +13,7 @@ You can replace your LCDClient instance with AsyncLCDClient inside a coroutine f
     :emphasize-lines: 5,8
 
     import asyncio 
-    from terra-classic_sdk.client.lcd import AsyncLCDClient
+    from terra_classic_sdk.client.lcd import AsyncLCDClient
 
     async def main():
         terra = AsyncLCDClient("https://lcd.terra.dev", "columbus-5")
@@ -31,7 +31,7 @@ session. Here's the same code as above, this time using the ``async with`` const
     :emphasize-lines: 5
 
     import asyncio 
-    from terra-classic_sdk.client.lcd import AsyncLCDClient
+    from terra_classic_sdk.client.lcd import AsyncLCDClient
 
     async def main():
         async with AsyncLCDClient("https://lcd.terra.dev", "columbus-5") as terra:
@@ -50,10 +50,10 @@ are also asychronous and therefore must be awaited.
     :emphasize-lines: 12-13
 
     import asyncio
-    from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-    from terra-classic_sdk.client.lcd import AsyncLCDClient
-    from terra-classic_sdk.key.mnemonic import MnemonicKey
-    from terra-classic_sdk.core import Coins
+    from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+    from terra_classic_sdk.client.lcd import AsyncLCDClient
+    from terra_classic_sdk.key.mnemonic import MnemonicKey
+    from terra_classic_sdk.core import Coins
 
     mk = MnemonicKey()
     recipient = "terra1..."
@@ -82,7 +82,7 @@ for more performance. For example:
     import asyncio
     import uvloop
 
-    from terra-classic_sdk.client.lcd import AsyncLCDClient
+    from terra_classic_sdk.client.lcd import AsyncLCDClient
 
     async def main():
         async with AsyncLCDClient("https://lcd.terra.dev", "columbus-5") as terra:
diff --git a/docs/guides/custom_key.rst b/docs/guides/custom_key.rst
index f11cbf0..eac6ad5 100644
--- a/docs/guides/custom_key.rst
+++ b/docs/guides/custom_key.rst
@@ -10,16 +10,16 @@ Here are just a couple  that help guide
 your design pathways:
 
 Is the private key accessible by developer?
-    * YES: Subclass :class:`terra-classic_sdk.key.raw.RawKey`
-    * NO: Subclass :class:`terra-classic_sdk.key.key.Key`
+    * YES: Subclass :class:`terra_classic_sdk.key.raw.RawKey`
+    * NO: Subclass :class:`terra_classic_sdk.key.key.Key`
 
 Can the signing agent sign arbitrary data payloads AND use ECDSA on Secp256k1?
-    * YES: Override :meth:`Key.sign()`
-    * NO: Override :meth:`Key.create_signature()`
+    * YES: Override :meth:`Key.sign()`
+    * NO: Override :meth:`Key.create_signature()`
 
 Can you determine the public key in advance, and is it static?
     * YES: Call ``super()`` in constructor with public key to generate addresses & pubkeys
-    * NO: Override :meth:`acc_address`, :meth:`val_address`, :meth:`acc_pubkey`, :meth:`val_pubkey` properties.
+    * NO: Override :meth:`acc_address`, :meth:`val_address`, :meth:`acc_pubkey`, :meth:`val_pubkey` properties.
 
 
 Usually, reasons for requiring a custom Key fall into one of 3 patterns:
@@ -45,7 +45,7 @@ The source for MnemonicKey is provided as an example:
 
 .. code-block:: python
 
-    from terra-classic_sdk.key.raw import RawKey
+    from terra_classic_sdk.key.raw import RawKey
     from bip32utils import BIP32_HARDEN, BIP32Key
     from mnemonic import Mnemonic
 
diff --git a/docs/guides/lcdclient.rst b/docs/guides/lcdclient.rst
index b919607..abedc5a 100644
--- a/docs/guides/lcdclient.rst
+++ b/docs/guides/lcdclient.rst
@@ -13,7 +13,7 @@ Create a new LCDClient instance by specifying the URL and chain ID of the node t
 
 .. code-block:: python
 
-    >>> from terra-classic_sdk.client.lcd import LCDClient
+    >>> from terra_classic_sdk.client.lcd import LCDClient
     >>> terra = LCDClient(url="https://lcd.terra.dev", chain_id="columbus-5")
     >>> terra.tendermint.node_info()['default_node_info']['network']
     'columbus-5'
@@ -24,7 +24,7 @@ You can also specify gas estimation parameters for your chain for building trans
     :emphasize-lines: 8-9
 
     import requests
-    from terra-classic_sdk.core import Coins
+    from terra_classic_sdk.core import Coins
 
     res = requests.get("https://fcd.terra.dev/v1/txs/gas_prices")
     terra = LCDClient(
@@ -39,7 +39,7 @@ Using the module APIs
 ---------------------
 
 LCDClient includes functions for interacting with each of the core modules (see sidebar). These functions are divided and
-and organized by module name (eg. :class:`terra.market`), and handle 
+and organized by module name (eg. :class:`terra.market`), and handle 
 the tedium of building HTTP requests, parsing the results, and handling errors. 
 
 Each request fetches live data from the blockchain:
@@ -65,7 +65,7 @@ are useful for easily creating and signing transactions.
 
 .. code-block:: python
 
-    >>> from terra-classic_sdk.key.mnemonic import MnemonicKey
+    >>> from terra_classic_sdk.key.mnemonic import MnemonicKey
     >>> mk = MnemonicKey()
     >>> wallet = terra.wallet(mk)
     >>> wallet.account_number()
@@ -75,5 +75,5 @@ are useful for easily creating and signing transactions.
 LCDClient Reference
 -------------------
 
-.. autoclass:: terra-classic_sdk.client.lcd.LCDClient
+.. autoclass:: terra_classic_sdk.client.lcd.LCDClient
     :members:
diff --git a/docs/guides/pagination.rst b/docs/guides/pagination.rst
index 98d4eb4..2c6988a 100644
--- a/docs/guides/pagination.rst
+++ b/docs/guides/pagination.rst
@@ -6,10 +6,10 @@ You can query information with Pagination to get information partially.
 PaginationOption
 ----------------
 
-.. autoclass:: terra-classic_sdk.client.lcd.params.APIParams
+.. autoclass:: terra_classic_sdk.client.lcd.params.APIParams
     :members:
 
-.. autoclass:: terra-classic_sdk.client.lcd.params.PaginationOptions
+.. autoclass:: terra_classic_sdk.client.lcd.params.PaginationOptions
     :members:
 
 You can use PaginationOptions as APIParams for params of query functions.
@@ -17,7 +17,7 @@ You can use PaginationOptions as APIParams for params of query functions.
 .. code-block:: python
     :emphasize-lines: 5,8
 
-    from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
+    from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
 
     terra = LCDClient(
         url="https://lcd.terra.dev/",
diff --git a/docs/guides/smart_contracts.rst b/docs/guides/smart_contracts.rst
index 82f74bb..0cc3cb4 100644
--- a/docs/guides/smart_contracts.rst
+++ b/docs/guides/smart_contracts.rst
@@ -9,10 +9,10 @@ Contract Deployment Example
 .. code-block:: python
 
     import base64
-    from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-    from terra-classic_sdk.client.localterra import LocalTerra
-    from terra-classic_sdk.core.wasm import MsgStoreCode, MsgInstantiateContract, MsgExecuteContract    
-    from terra-classic_sdk.core.fee import Fee
+    from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+    from terra_classic_sdk.client.localterra import LocalTerra
+    from terra_classic_sdk.core.wasm import MsgStoreCode, MsgInstantiateContract, MsgExecuteContract    
+    from terra_classic_sdk.core.fee import Fee
     
     terra = LocalTerra()
     test1 = terra.wallets["test1"]
diff --git a/docs/guides/transactions.rst b/docs/guides/transactions.rst
index 4a90f14..7076302 100644
--- a/docs/guides/transactions.rst
+++ b/docs/guides/transactions.rst
@@ -5,7 +5,7 @@ If you want to perform a state-changing operation on the Terra blockchain such a
 sending tokens, swapping assets, withdrawing rewards, or even invoking functions on
 smart contracts, you must create a **transaction** and broadcast it to the network.
 
-An :class:`StdTx` is a data object that represents
+An :class:`StdTx` is a data object that represents
 a transaction. It contains:
 
 - **msgs**: a list of state-altering messages
@@ -22,16 +22,16 @@ Using a Wallet (recommended)
     This method requires an LCDClient instance with a proper node connection. If you
     can't use Wallet, see `Signing transactions manually`_.
 
-A :class:`Wallet` allows you to create and sign a transaction in a single step by automatically
+A :class:`Wallet` allows you to create and sign a transaction in a single step by automatically
 fetching the latest information from the blockchain (chain ID, account number, sequence).
 
-Use :meth:`LCDClient.wallet()` to create a Wallet from any Key instance. The Key provided should
+Use :meth:`LCDClient.wallet()` to create a Wallet from any Key instance. The Key provided should
 correspond to the account you intend to sign the transaction with.
 
 .. code-block:: python
 
-    from terra-classic_sdk.client.lcd import LCDClient
-    from terra-classic_sdk.key.mnemonic import MnemonicKey
+    from terra_classic_sdk.client.lcd import LCDClient
+    from terra_classic_sdk.key.mnemonic import MnemonicKey
 
     mk = MnemonicKey(mnemonic=MNEMONIC) 
     terra = LCDClient("https://lcd.terra.dev", "columbus-5")
@@ -42,9 +42,9 @@ Once you have your Wallet, you can simply create a StdTx using :meth:`Wallet.cre
 
 .. code-block:: python
 
-    from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-    from terra-classic_sdk.core.fee import Fee
-    from terra-classic_sdk.core.bank import MsgSend
+    from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+    from terra_classic_sdk.core.fee import Fee
+    from terra_classic_sdk.core.bank import MsgSend
 
     tx = wallet.create_and_sign_tx(
         CreateTxOptions(
@@ -69,7 +69,7 @@ And that's it! You should now be able to broadcast your transaction to the netwo
 Automatic fee estimation
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-If no ``fee`` parameter is provided for :meth:`Wallet.create_and_sign_tx()`,
+If no ``fee`` parameter is provided for :meth:`Wallet.create_and_sign_tx()`,
 the transaction fee will be simulated against the node and populated for you. By default, ``Wallet``
 will use the fee estimation parameters of the ``LCDClient`` used to create it. You can override
 this behavior **per transaction**:
@@ -105,7 +105,7 @@ Signing transactions manually
 -----------------------------
 
 Below is the full process of signing a transaction manually that does not use ``Wallet``.
-You will need to build a :class:`SignDoc`,
+You will need to build a :class:`SignDoc`,
 sign it, and add the signatures to an ``Tx``.
 
 A SignDoc contains the information required to build a StdTx:
@@ -118,13 +118,13 @@ A SignDoc contains the information required to build a StdTx:
 
 .. code-block:: python
 
-    from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
-    from terra-classic_sdk.client.lcd import LCDClient
-    from terra-classic_sdk.core.bank import MsgSend
-    from terra-classic_sdk.core.tx import SignMode
-    from terra-classic_sdk.key.key import SignOptions
-    from terra-classic_sdk.key.mnemonic import MnemonicKey
-    from terra-classic_sdk.core import Coin, Coins
+    from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
+    from terra_classic_sdk.client.lcd import LCDClient
+    from terra_classic_sdk.core.bank import MsgSend
+    from terra_classic_sdk.core.tx import SignMode
+    from terra_classic_sdk.key.key import SignOptions
+    from terra_classic_sdk.key.mnemonic import MnemonicKey
+    from terra_classic_sdk.core import Coin, Coins
 
     terra = LCDClient("https://lcd.terra.dev", "columbus-5")
     key = MnemonicKey(mnemonic=MNEMONIC)
@@ -167,7 +167,7 @@ Applying multiple signatures
 
 Some messages, such as ``MsgMultiSend``, require the transaction to be signed with multiple signatures.
 You must prepare a separate ``SignDoc`` for each signer to sign individually, and then
-combine them in the ``signatures`` field of the final :class:`StdTx` object. 
+combine them in the ``signatures`` field of the final :class:`StdTx` object. 
 Each ``SignDoc`` should only differ by ``account`` and ``sequence``, which vary according to the signing key.
 
 .. note::
@@ -176,11 +176,11 @@ Each ``SignDoc`` should only differ by ``account`` and ``sequence``, which vary
 
 .. code-block:: python
 
-    from terra-classic_sdk.client.lcd import LCDClient
-    from terra-classic_sdk.core.fee import Fee
-    from terra-classic_sdk.core.bank import MsgMultiSend
-    from terra-classic_sdk.key.mnemonic import MnemonicKey
-    from terra-classic_sdk.core.bank import MsgMultiSend, MultiSendInput, MultiSendOutput
+    from terra_classic_sdk.client.lcd import LCDClient
+    from terra_classic_sdk.core.fee import Fee
+    from terra_classic_sdk.core.bank import MsgMultiSend
+    from terra_classic_sdk.key.mnemonic import MnemonicKey
+    from terra_classic_sdk.core.bank import MsgMultiSend, MultiSendInput, MultiSendOutput
 
     terra = LCDClient("https://lcd.terra.dev", "columbus-5")
     wallet1 = terra.wallet(MnemonicKey(mnemonic=MNEMONIC_1))
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index baeb85b..44911f2 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -33,7 +33,7 @@ This can be done through setting up an LCDClient:
 
 .. code-block:: python
 
-    from terra-classic_sdk.client.lcd import LCDClient
+    from terra_classic_sdk.client.lcd import LCDClient
 
     terra = LCDClient(chain_id="columbus-5", url="https://lcd.terra.dev")
     print(terra.tendermint.node_info())
diff --git a/integration_tests/async_codec.py b/integration_tests/async_codec.py
index db7a1f7..8bc0dbf 100644
--- a/integration_tests/async_codec.py
+++ b/integration_tests/async_codec.py
@@ -2,11 +2,11 @@
 
 import uvloop
 
-from terra-classic_sdk.client.lcd import AsyncLCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd import AsyncLCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 async def with_sem(aw, sem):
diff --git a/integration_tests/async_contract.py b/integration_tests/async_contract.py
index 70fcd6b..e92afeb 100644
--- a/integration_tests/async_contract.py
+++ b/integration_tests/async_contract.py
@@ -3,11 +3,11 @@
 
 import uvloop
 
-from terra-classic_sdk.client.lcd import AsyncLCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
-from terra-classic_sdk.key.mnemonic import MnemonicKey
-from terra-classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
+from terra_classic_sdk.client.lcd import AsyncLCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
+from terra_classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
 
 
 async def main():
diff --git a/integration_tests/async_parallel.py b/integration_tests/async_parallel.py
index 9d1e83c..2330120 100644
--- a/integration_tests/async_parallel.py
+++ b/integration_tests/async_parallel.py
@@ -2,7 +2,7 @@
 
 import uvloop
 
-from terra-classic_sdk.client.lcd import AsyncLCDClient
+from terra_classic_sdk.client.lcd import AsyncLCDClient
 
 
 async def with_sem(aw, sem):
diff --git a/integration_tests/async_send.py b/integration_tests/async_send.py
index b0f2cf6..a804ac1 100644
--- a/integration_tests/async_send.py
+++ b/integration_tests/async_send.py
@@ -2,11 +2,11 @@
 
 import uvloop
 
-from terra-classic_sdk.client.lcd import AsyncLCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd import AsyncLCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 async def with_sem(aw, sem):
diff --git a/integration_tests/contract.py b/integration_tests/contract.py
index b8fd1a2..7c3e774 100644
--- a/integration_tests/contract.py
+++ b/integration_tests/contract.py
@@ -1,11 +1,11 @@
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.fee import Fee
-from terra-classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
-from terra-classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.fee import Fee
+from terra_classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
+from terra_classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
 
 
 def main():
diff --git a/integration_tests/contract_async.py b/integration_tests/contract_async.py
index 9d4845c..c559042 100644
--- a/integration_tests/contract_async.py
+++ b/integration_tests/contract_async.py
@@ -1,10 +1,10 @@
 import asyncio
 from pathlib import Path
 
-from terra-classic_sdk.client.localterra import AsyncLocalTerra
-from terra-classic_sdk.core import Coins, Fee
-from terra-classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
-from terra-classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
+from terra_classic_sdk.client.localterra import AsyncLocalTerra
+from terra_classic_sdk.core import Coins, Fee
+from terra_classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
+from terra_classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
 
 
 async def async_main():
diff --git a/integration_tests/contract_str.py b/integration_tests/contract_str.py
index 206e8cd..18add4b 100644
--- a/integration_tests/contract_str.py
+++ b/integration_tests/contract_str.py
@@ -1,11 +1,11 @@
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.fee import Fee
-from terra-classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
-from terra-classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.fee import Fee
+from terra_classic_sdk.core.wasm import MsgExecuteContract, MsgInstantiateContract, MsgStoreCode
+from terra_classic_sdk.util.contract import get_code_id, get_contract_address, read_file_as_b64
 
 
 def main():
diff --git a/integration_tests/decode_msg_verify_invariant.py b/integration_tests/decode_msg_verify_invariant.py
index 1e967ea..658bd30 100644
--- a/integration_tests/decode_msg_verify_invariant.py
+++ b/integration_tests/decode_msg_verify_invariant.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 
 def main():
diff --git a/integration_tests/from_contract_events.py b/integration_tests/from_contract_events.py
index 508c615..8a2cf5c 100644
--- a/integration_tests/from_contract_events.py
+++ b/integration_tests/from_contract_events.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.util.contract import get_contract_events
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.util.contract import get_contract_events
 
 tequila = LCDClient(url="https://lcd.terra.dev", chain_id="columbus-5")
 tx_info = tequila.tx.tx_info(
diff --git a/integration_tests/multisend.py b/integration_tests/multisend.py
index b26c3f2..f22db1d 100644
--- a/integration_tests/multisend.py
+++ b/integration_tests/multisend.py
@@ -16,15 +16,15 @@
 
 """
 
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 # import lcd_tx
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core.bank import MsgMultiSend, MsgSend, MultiSendInput, MultiSendOutput
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.key.mnemonic import MnemonicKey
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core.bank import MsgMultiSend, MsgSend, MultiSendInput, MultiSendOutput
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.util.json import JSONSerializable
 
 """ untested
 import lcd_gov
@@ -32,8 +32,8 @@
 
 ########
 
-from terra-classic_sdk.core import Coin, Coins
-from terra-classic_sdk.core.public_key import SimplePublicKey
+from terra_classic_sdk.core import Coin, Coins
+from terra_classic_sdk.core.public_key import SimplePublicKey
 
 
 def main():
diff --git a/integration_tests/multisend2.py b/integration_tests/multisend2.py
index 56a0781..127a86c 100644
--- a/integration_tests/multisend2.py
+++ b/integration_tests/multisend2.py
@@ -16,15 +16,15 @@
 
 """
 
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 # import lcd_tx
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core.bank import MsgMultiSend, MsgSend, MultiSendInput, MultiSendOutput
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.key.key import SignOptions
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core.bank import MsgMultiSend, MsgSend, MultiSendInput, MultiSendOutput
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.key.key import SignOptions
+from terra_classic_sdk.util.json import JSONSerializable
 
 """ untested
 import lcd_gov
@@ -32,8 +32,8 @@
 
 ########
 
-from terra-classic_sdk.core import Coin, Coins, SignDoc
-from terra-classic_sdk.core.public_key import SimplePublicKey
+from terra_classic_sdk.core import Coin, Coins, SignDoc
+from terra_classic_sdk.core.public_key import SimplePublicKey
 
 
 def main():
diff --git a/integration_tests/multisig.py b/integration_tests/multisig.py
index 6782c76..d262ef9 100644
--- a/integration_tests/multisig.py
+++ b/integration_tests/multisig.py
@@ -2,17 +2,17 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import (
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import (
     Coins,
     LegacyAminoMultisigPublicKey,
     MultiSignature,
     SignatureV2,
     SignDoc,
 )
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.util.contract import get_code_id
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.util.contract import get_code_id
 
 
 def main():
diff --git a/integration_tests/nodeinfo.py b/integration_tests/nodeinfo.py
index ba1dc74..42ad16c 100644
--- a/integration_tests/nodeinfo.py
+++ b/integration_tests/nodeinfo.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     chain_id="bombay-12",
diff --git a/integration_tests/query.py b/integration_tests/query.py
index a0e7822..0011ee5 100644
--- a/integration_tests/query.py
+++ b/integration_tests/query.py
@@ -2,10 +2,10 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.util.contract import get_code_id
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.util.contract import get_code_id
 
 
 def main():
diff --git a/integration_tests/query_account.py b/integration_tests/query_account.py
index d6fe743..294fd7e 100644
--- a/integration_tests/query_account.py
+++ b/integration_tests/query_account.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(chain_id="bombay-12", url="https://bombay-lcd.terra.dev")
 
diff --git a/integration_tests/query_async.py b/integration_tests/query_async.py
index 4796777..1beea9f 100644
--- a/integration_tests/query_async.py
+++ b/integration_tests/query_async.py
@@ -3,10 +3,10 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd import AsyncLCDClient
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.util.contract import get_code_id
+from terra_classic_sdk.client.lcd import AsyncLCDClient
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.util.contract import get_code_id
 
 
 async def main():
diff --git a/integration_tests/query_proposal.py b/integration_tests/query_proposal.py
index 128a5ef..273d17d 100644
--- a/integration_tests/query_proposal.py
+++ b/integration_tests/query_proposal.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(chain_id="bombay-12", url="https://bombay-lcd.terra.dev")
 res = terra.gov.deposits(proposal_id=5333)
diff --git a/integration_tests/query_proposals.py b/integration_tests/query_proposals.py
index 138efb5..9cb3b59 100644
--- a/integration_tests/query_proposals.py
+++ b/integration_tests/query_proposals.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
-from terra-classic_sdk.client.lcd.api.gov import ProposalStatus
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd.api.gov import ProposalStatus
 
 terra = LCDClient(
     url="https://lcd.terra.dev/",
diff --git a/integration_tests/send.py b/integration_tests/send.py
index 6adb4be..761ae2c 100644
--- a/integration_tests/send.py
+++ b/integration_tests/send.py
@@ -2,12 +2,12 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 def main():
diff --git a/integration_tests/send_async.py b/integration_tests/send_async.py
index b283d2d..5af841d 100644
--- a/integration_tests/send_async.py
+++ b/integration_tests/send_async.py
@@ -2,12 +2,12 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 def main():
diff --git a/integration_tests/send_sync.py b/integration_tests/send_sync.py
index 5bdf6bc..cf73c38 100644
--- a/integration_tests/send_sync.py
+++ b/integration_tests/send_sync.py
@@ -2,12 +2,12 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 def main():
diff --git a/integration_tests/send_with_opt.py b/integration_tests/send_with_opt.py
index 288032f..436a45f 100644
--- a/integration_tests/send_with_opt.py
+++ b/integration_tests/send_with_opt.py
@@ -2,11 +2,11 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd.api.tx import BroadcastOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.util.contract import get_code_id
+from terra_classic_sdk.client.lcd.api.tx import BroadcastOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.util.contract import get_code_id
 
 
 def main():
diff --git a/integration_tests/swap.py b/integration_tests/swap.py
index cb66846..ac707e4 100644
--- a/integration_tests/swap.py
+++ b/integration_tests/swap.py
@@ -2,12 +2,12 @@
 import base64
 from pathlib import Path
 
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.core.market import MsgSwap
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.core.market import MsgSwap
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 def main():
diff --git a/integration_tests/test.py b/integration_tests/test.py
index 802ff6e..3c7ddf9 100644
--- a/integration_tests/test.py
+++ b/integration_tests/test.py
@@ -1,9 +1,9 @@
 """
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coin, Coins
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coin, Coins
 
-from terra-classic_sdk.core.authz import MsgGrantAuthorization, MsgExecAuthorized, MsgRevokeAuthorization
+from terra_classic_sdk.core.authz import MsgGrantAuthorization, MsgExecAuthorized, MsgRevokeAuthorization
 """
 
 """ untested
diff --git a/integration_tests/tx_authz.py b/integration_tests/tx_authz.py
index 464351e..0bb4583 100644
--- a/integration_tests/tx_authz.py
+++ b/integration_tests/tx_authz.py
@@ -1,6 +1,6 @@
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core.authz import (
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core.authz import (
     MsgExecAuthorized,
     MsgGrantAuthorization,
     MsgRevokeAuthorization,
diff --git a/integration_tests/tx_distribution.py b/integration_tests/tx_distribution.py
index d333d8d..c650df2 100644
--- a/integration_tests/tx_distribution.py
+++ b/integration_tests/tx_distribution.py
@@ -1,7 +1,7 @@
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coin, Coins
-from terra-classic_sdk.core.distribution import (
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coin, Coins
+from terra_classic_sdk.core.distribution import (
     MsgFundCommunityPool,
     MsgSetWithdrawAddress,
     MsgWithdrawDelegatorReward,
diff --git a/integration_tests/tx_ibc-transfer.py b/integration_tests/tx_ibc-transfer.py
index baab576..2a487bb 100644
--- a/integration_tests/tx_ibc-transfer.py
+++ b/integration_tests/tx_ibc-transfer.py
@@ -1,11 +1,11 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.core import Coin, Coins
-from terra-classic_sdk.core.ibc import Height
-from terra-classic_sdk.core.ibc_transfer import MsgTransfer
-from terra-classic_sdk.exceptions import LCDResponseError
-from terra-classic_sdk.key.mnemonic import MnemonicKey
-from terra-classic_sdk.util.contract import get_code_id
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.core import Coin, Coins
+from terra_classic_sdk.core.ibc import Height
+from terra_classic_sdk.core.ibc_transfer import MsgTransfer
+from terra_classic_sdk.exceptions import LCDResponseError
+from terra_classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.util.contract import get_code_id
 
 
 def main():
diff --git a/integration_tests/tx_market.py b/integration_tests/tx_market.py
index 1948383..6249209 100644
--- a/integration_tests/tx_market.py
+++ b/integration_tests/tx_market.py
@@ -1,9 +1,9 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core.market import MsgSwap, MsgSwapSend
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core.market import MsgSwap, MsgSwapSend
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.util.json import JSONSerializable
 
 """ untested
 import lcd_gov
@@ -11,8 +11,8 @@
 
 ########
 
-from terra-classic_sdk.core import Coin, Coins
-from terra-classic_sdk.core.public_key import SimplePublicKey
+from terra_classic_sdk.core import Coin, Coins
+from terra_classic_sdk.core.public_key import SimplePublicKey
 
 
 def main():
diff --git a/integration_tests/tx_staking.py b/integration_tests/tx_staking.py
index 2c4f2f1..a94f179 100644
--- a/integration_tests/tx_staking.py
+++ b/integration_tests/tx_staking.py
@@ -1,9 +1,9 @@
 import base64
 
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coin, Coins, ValConsPubKey
-from terra-classic_sdk.core.staking import (
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coin, Coins, ValConsPubKey
+from terra_classic_sdk.core.staking import (
     CommissionRates,
     Description,
     MsgBeginRedelegate,
diff --git a/integration_tests/tx_test.py b/integration_tests/tx_test.py
index a466357..4e02c87 100644
--- a/integration_tests/tx_test.py
+++ b/integration_tests/tx_test.py
@@ -17,16 +17,16 @@
 """
 
 
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
 
 # import lcd_tx
-from terra-classic_sdk.client.localterra import LocalTerra
-from terra-classic_sdk.core import Coin, Coins
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.core.tx import SignMode
-from terra-classic_sdk.key.key import SignOptions
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.localterra import LocalTerra
+from terra_classic_sdk.core import Coin, Coins
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.core.tx import SignMode
+from terra_classic_sdk.key.key import SignOptions
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 def main():
diff --git a/integration_tests/txinfo_msgtransfer.py b/integration_tests/txinfo_msgtransfer.py
index 1430e1d..97a251a 100644
--- a/integration_tests/txinfo_msgtransfer.py
+++ b/integration_tests/txinfo_msgtransfer.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 if __name__ == "__main__":
     client = LCDClient(url="https://lcd.terra.dev", chain_id="columbus-5")
diff --git a/integration_tests/validator_rewards.py b/integration_tests/validator_rewards.py
index 08877cc..b1866c0 100644
--- a/integration_tests/validator_rewards.py
+++ b/integration_tests/validator_rewards.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(chain_id="bombay-12", url="https://bombay-lcd.terra.dev")
 print(
diff --git a/mypy.ini b/mypy.ini
index aff1359..8b9d21c 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -40,7 +40,7 @@ warn_unused_ignores=False
 disallow_untyped_defs=False
 check_untyped_defs=False
 
-files = terra-classic_sdk
+files = terra_classic_sdk
 show_error_codes = True
 pretty = True
 
diff --git a/pyproject.toml b/pyproject.toml
index d0af0df..8f68eeb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,12 +14,12 @@ classifiers = [
 description = "The Python SDK for Terra Classic"
 documentation = "https://terra-money.github.io/terra.py/index.html"
 homepage = "https://github.com/geoffmunn/terra.py"
-keywords = ["jigu", "blockchain", "terra", "terra-classic", "lunc" "defi", "crypto"]
+keywords = ["jigu", "blockchain", "terra", "terra classic", "lunc", "defi", "crypto"]
 license = "MIT"
-packages = [{ include = "terra-classic_sdk" }]
+packages = [{ include = "terra_classic_sdk" }]
 readme = "README.md"
 repository = "https://github.com/terra-money/terra.py"
-version = "2.0.6"
+version = "2.0.7"
 
 [tool.poetry.dependencies]
 aiohttp = "^3.8.1"
diff --git a/terra-classic_sdk/.DS_Store b/terra_classic_sdk/.DS_Store
similarity index 100%
rename from terra-classic_sdk/.DS_Store
rename to terra_classic_sdk/.DS_Store
diff --git a/terra-classic_sdk/__init__.py b/terra_classic_sdk/__init__.py
similarity index 100%
rename from terra-classic_sdk/__init__.py
rename to terra_classic_sdk/__init__.py
diff --git a/terra-classic_sdk/client/__init__.py b/terra_classic_sdk/client/__init__.py
similarity index 100%
rename from terra-classic_sdk/client/__init__.py
rename to terra_classic_sdk/client/__init__.py
diff --git a/terra-classic_sdk/client/lcd/__init__.py b/terra_classic_sdk/client/lcd/__init__.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/__init__.py
rename to terra_classic_sdk/client/lcd/__init__.py
diff --git a/terra-classic_sdk/client/lcd/api/__init__.py b/terra_classic_sdk/client/lcd/api/__init__.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/api/__init__.py
rename to terra_classic_sdk/client/lcd/api/__init__.py
diff --git a/terra-classic_sdk/client/lcd/api/_base.py b/terra_classic_sdk/client/lcd/api/_base.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/api/_base.py
rename to terra_classic_sdk/client/lcd/api/_base.py
diff --git a/terra-classic_sdk/client/lcd/api/auth.py b/terra_classic_sdk/client/lcd/api/auth.py
similarity index 88%
rename from terra-classic_sdk/client/lcd/api/auth.py
rename to terra_classic_sdk/client/lcd/api/auth.py
index 4768af2..279abf7 100644
--- a/terra-classic_sdk/client/lcd/api/auth.py
+++ b/terra_classic_sdk/client/lcd/api/auth.py
@@ -1,7 +1,7 @@
 from typing import Union
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.auth import Account, LazyGradedVestingAccount
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.auth import Account, LazyGradedVestingAccount
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/authz.py b/terra_classic_sdk/client/lcd/api/authz.py
similarity index 93%
rename from terra-classic_sdk/client/lcd/api/authz.py
rename to terra_classic_sdk/client/lcd/api/authz.py
index 746a987..6c20317 100644
--- a/terra-classic_sdk/client/lcd/api/authz.py
+++ b/terra_classic_sdk/client/lcd/api/authz.py
@@ -1,7 +1,7 @@
 from typing import List, Optional
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.authz import AuthorizationGrant
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.authz import AuthorizationGrant
 
 from ..params import APIParams
 from ._base import BaseAsyncAPI, sync_bind
diff --git a/terra-classic_sdk/client/lcd/api/bank.py b/terra_classic_sdk/client/lcd/api/bank.py
similarity index 96%
rename from terra-classic_sdk/client/lcd/api/bank.py
rename to terra_classic_sdk/client/lcd/api/bank.py
index 954c1fd..45f72b6 100644
--- a/terra-classic_sdk/client/lcd/api/bank.py
+++ b/terra_classic_sdk/client/lcd/api/bank.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from terra-classic_sdk.core import AccAddress, Coins
+from terra_classic_sdk.core import AccAddress, Coins
 
 from ..params import APIParams
 from ._base import BaseAsyncAPI, sync_bind
diff --git a/terra-classic_sdk/client/lcd/api/distribution.py b/terra_classic_sdk/client/lcd/api/distribution.py
similarity index 98%
rename from terra-classic_sdk/client/lcd/api/distribution.py
rename to terra_classic_sdk/client/lcd/api/distribution.py
index bd7f8d7..e757179 100644
--- a/terra-classic_sdk/client/lcd/api/distribution.py
+++ b/terra_classic_sdk/client/lcd/api/distribution.py
@@ -2,7 +2,7 @@
 
 import attr
 
-from terra-classic_sdk.core import AccAddress, Coins, ValAddress
+from terra_classic_sdk.core import AccAddress, Coins, ValAddress
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/feegrant.py b/terra_classic_sdk/client/lcd/api/feegrant.py
similarity index 96%
rename from terra-classic_sdk/client/lcd/api/feegrant.py
rename to terra_classic_sdk/client/lcd/api/feegrant.py
index 54b8059..8d8a337 100644
--- a/terra-classic_sdk/client/lcd/api/feegrant.py
+++ b/terra_classic_sdk/client/lcd/api/feegrant.py
@@ -1,7 +1,7 @@
 from typing import Optional
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.feegrant import Allowance
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.feegrant import Allowance
 
 from ..params import APIParams
 from ._base import BaseAsyncAPI, sync_bind
diff --git a/terra-classic_sdk/client/lcd/api/gov.py b/terra_classic_sdk/client/lcd/api/gov.py
similarity index 97%
rename from terra-classic_sdk/client/lcd/api/gov.py
rename to terra_classic_sdk/client/lcd/api/gov.py
index d64f335..afbdbf1 100644
--- a/terra-classic_sdk/client/lcd/api/gov.py
+++ b/terra_classic_sdk/client/lcd/api/gov.py
@@ -1,9 +1,9 @@
 from typing import List, Optional
 
-from terra-classic_sdk.core import Coins, Dec
-from terra-classic_sdk.core.deposit import Deposit
-from terra-classic_sdk.core.gov import Proposal, ProposalStatus, WeightedVoteOption
-from terra-classic_sdk.core.gov.data import Vote
+from terra_classic_sdk.core import Coins, Dec
+from terra_classic_sdk.core.deposit import Deposit
+from terra_classic_sdk.core.gov import Proposal, ProposalStatus, WeightedVoteOption
+from terra_classic_sdk.core.gov.data import Vote
 
 from ._base import BaseAsyncAPI, sync_bind
 
@@ -20,7 +20,7 @@ async def proposals(
         Args:
             options (dict, optional): dictionary containing options. Defaults to {}. you can use one or more below:
                 {
-                    "proposal_status": terra-classic_sdk.core.gov.ProposalStatus (int)
+                    "proposal_status": terra_classic_sdk.core.gov.ProposalStatus (int)
                     "voter": voter address (str),
                     "depositor": depositor address(str)
                 }
diff --git a/terra-classic_sdk/client/lcd/api/ibc.py b/terra_classic_sdk/client/lcd/api/ibc.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/api/ibc.py
rename to terra_classic_sdk/client/lcd/api/ibc.py
diff --git a/terra-classic_sdk/client/lcd/api/ibc_transfer.py b/terra_classic_sdk/client/lcd/api/ibc_transfer.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/api/ibc_transfer.py
rename to terra_classic_sdk/client/lcd/api/ibc_transfer.py
diff --git a/terra-classic_sdk/client/lcd/api/market.py b/terra_classic_sdk/client/lcd/api/market.py
similarity index 97%
rename from terra-classic_sdk/client/lcd/api/market.py
rename to terra_classic_sdk/client/lcd/api/market.py
index 70c2e47..792ee49 100644
--- a/terra-classic_sdk/client/lcd/api/market.py
+++ b/terra_classic_sdk/client/lcd/api/market.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core import Coin, Dec
+from terra_classic_sdk.core import Coin, Dec
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/mint.py b/terra_classic_sdk/client/lcd/api/mint.py
similarity index 97%
rename from terra-classic_sdk/client/lcd/api/mint.py
rename to terra_classic_sdk/client/lcd/api/mint.py
index ab5ce8f..244fdff 100644
--- a/terra-classic_sdk/client/lcd/api/mint.py
+++ b/terra_classic_sdk/client/lcd/api/mint.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core import Dec, Numeric
+from terra_classic_sdk.core import Dec, Numeric
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/oracle.py b/terra_classic_sdk/client/lcd/api/oracle.py
similarity index 97%
rename from terra-classic_sdk/client/lcd/api/oracle.py
rename to terra_classic_sdk/client/lcd/api/oracle.py
index fa0c827..653252f 100644
--- a/terra-classic_sdk/client/lcd/api/oracle.py
+++ b/terra_classic_sdk/client/lcd/api/oracle.py
@@ -1,11 +1,11 @@
 from typing import List, Optional
 
-from terra-classic_sdk.core import AccAddress, Coin, Coins, Dec, Numeric, ValAddress
-from terra-classic_sdk.core.oracle import (
+from terra_classic_sdk.core import AccAddress, Coin, Coins, Dec, Numeric, ValAddress
+from terra_classic_sdk.core.oracle import (
     AggregateExchangeRatePrevote,
     AggregateExchangeRateVote,
 )
-from terra-classic_sdk.exceptions import LCDResponseError
+from terra_classic_sdk.exceptions import LCDResponseError
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/slashing.py b/terra_classic_sdk/client/lcd/api/slashing.py
similarity index 98%
rename from terra-classic_sdk/client/lcd/api/slashing.py
rename to terra_classic_sdk/client/lcd/api/slashing.py
index d8781e5..26caea3 100644
--- a/terra-classic_sdk/client/lcd/api/slashing.py
+++ b/terra_classic_sdk/client/lcd/api/slashing.py
@@ -2,7 +2,7 @@
 
 from dateutil import parser
 
-from terra-classic_sdk.core import Dec, Numeric, ValConsPubKey
+from terra_classic_sdk.core import Dec, Numeric, ValConsPubKey
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/staking.py b/terra_classic_sdk/client/lcd/api/staking.py
similarity index 99%
rename from terra-classic_sdk/client/lcd/api/staking.py
rename to terra_classic_sdk/client/lcd/api/staking.py
index 630c912..eb98ae2 100644
--- a/terra-classic_sdk/client/lcd/api/staking.py
+++ b/terra_classic_sdk/client/lcd/api/staking.py
@@ -2,8 +2,8 @@
 
 import attr
 
-from terra-classic_sdk.core import AccAddress, Coin, Numeric, ValAddress
-from terra-classic_sdk.core.staking import (
+from terra_classic_sdk.core import AccAddress, Coin, Numeric, ValAddress
+from terra_classic_sdk.core.staking import (
     Delegation,
     Redelegation,
     UnbondingDelegation,
diff --git a/terra-classic_sdk/client/lcd/api/tendermint.py b/terra_classic_sdk/client/lcd/api/tendermint.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/api/tendermint.py
rename to terra_classic_sdk/client/lcd/api/tendermint.py
diff --git a/terra-classic_sdk/client/lcd/api/treasury.py b/terra_classic_sdk/client/lcd/api/treasury.py
similarity index 96%
rename from terra-classic_sdk/client/lcd/api/treasury.py
rename to terra_classic_sdk/client/lcd/api/treasury.py
index ee7d2e4..097197d 100644
--- a/terra-classic_sdk/client/lcd/api/treasury.py
+++ b/terra_classic_sdk/client/lcd/api/treasury.py
@@ -1,7 +1,7 @@
 from typing import Optional
 
-from terra-classic_sdk.core import Coin, Coins, Dec, Numeric
-from terra-classic_sdk.core.treasury import PolicyConstraints
+from terra_classic_sdk.core import Coin, Coins, Dec, Numeric
+from terra_classic_sdk.core.treasury import PolicyConstraints
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/api/tx.py b/terra_classic_sdk/client/lcd/api/tx.py
similarity index 97%
rename from terra-classic_sdk/client/lcd/api/tx.py
rename to terra_classic_sdk/client/lcd/api/tx.py
index 53e5e78..40437d6 100644
--- a/terra-classic_sdk/client/lcd/api/tx.py
+++ b/terra_classic_sdk/client/lcd/api/tx.py
@@ -5,17 +5,17 @@
 import attr
 from multidict import CIMultiDict
 
-from terra-classic_sdk.core import AccAddress, Coins, Dec, Numeric, PublicKey
-from terra-classic_sdk.core.broadcast import (
+from terra_classic_sdk.core import AccAddress, Coins, Dec, Numeric, PublicKey
+from terra_classic_sdk.core.broadcast import (
     AsyncTxBroadcastResult,
     BlockTxBroadcastResult,
     SyncTxBroadcastResult,
 )
-from terra-classic_sdk.core.fee import Fee
-from terra-classic_sdk.core.msg import Msg
-from terra-classic_sdk.core.tx import AuthInfo, SignerData, SignMode, Tx, TxBody, TxInfo
-from terra-classic_sdk.util.hash import hash_amino
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.fee import Fee
+from terra_classic_sdk.core.msg import Msg
+from terra_classic_sdk.core.tx import AuthInfo, SignerData, SignMode, Tx, TxBody, TxInfo
+from terra_classic_sdk.util.hash import hash_amino
+from terra_classic_sdk.util.json import JSONSerializable
 
 from ..params import APIParams
 from ._base import BaseAsyncAPI, sync_bind
diff --git a/terra-classic_sdk/client/lcd/api/wasm.py b/terra_classic_sdk/client/lcd/api/wasm.py
similarity index 98%
rename from terra-classic_sdk/client/lcd/api/wasm.py
rename to terra_classic_sdk/client/lcd/api/wasm.py
index 9160999..45dd64e 100644
--- a/terra-classic_sdk/client/lcd/api/wasm.py
+++ b/terra_classic_sdk/client/lcd/api/wasm.py
@@ -2,7 +2,7 @@
 import json
 from typing import Any, Union
 
-from terra-classic_sdk.core import Numeric
+from terra_classic_sdk.core import Numeric
 
 from ._base import BaseAsyncAPI, sync_bind
 
diff --git a/terra-classic_sdk/client/lcd/lcdclient.py b/terra_classic_sdk/client/lcd/lcdclient.py
similarity index 88%
rename from terra-classic_sdk/client/lcd/lcdclient.py
rename to terra_classic_sdk/client/lcd/lcdclient.py
index 8f45c54..b88e1e5 100644
--- a/terra-classic_sdk/client/lcd/lcdclient.py
+++ b/terra_classic_sdk/client/lcd/lcdclient.py
@@ -8,11 +8,11 @@
 from aiohttp import ClientSession
 from multidict import CIMultiDict
 
-from terra-classic_sdk.core import Coins, Dec, Numeric
-from terra-classic_sdk.exceptions import LCDResponseError
-from terra-classic_sdk.key.key import Key
-from terra-classic_sdk.util.json import dict_to_data
-from terra-classic_sdk.util.url import urljoin
+from terra_classic_sdk.core import Coins, Dec, Numeric
+from terra_classic_sdk.exceptions import LCDResponseError
+from terra_classic_sdk.key.key import Key
+from terra_classic_sdk.util.json import dict_to_data
+from terra_classic_sdk.util.url import urljoin
 
 from .api.auth import AsyncAuthAPI, AuthAPI
 from .api.authz import AsyncAuthzAPI, AuthzAPI
@@ -202,55 +202,55 @@ class LCDClient(AsyncLCDClient):
     """Height of response of last-made made LCD request."""
 
     auth: AuthAPI
-    """:class:`AuthAPI`."""
+    """:class:`AuthAPI`."""
 
     bank: BankAPI
-    """:class:`BankAPI`."""
+    """:class:`BankAPI`."""
 
     distribution: DistributionAPI
-    """:class:`DistributionAPI`."""
+    """:class:`DistributionAPI`."""
 
     gov: GovAPI
-    """:class:`GovAPI`."""
+    """:class:`GovAPI`."""
 
     feegrant: FeeGrantAPI
-    """:class:`FeeGrant`."""
+    """:class:`FeeGrant`."""
 
     market: MarketAPI
-    """:class:`MarketAPI`."""
+    """:class:`MarketAPI`."""
 
     mint: MintAPI
-    """:class:`MintAPI`."""
+    """:class:`MintAPI`."""
 
     authz: AuthzAPI
-    """:class:`AuthzAPI`."""
+    """:class:`AuthzAPI`."""
 
     oracle: OracleAPI
-    """:class:`OracleAPI`."""
+    """:class:`OracleAPI`."""
 
     slashing: SlashingAPI
-    """:class:`SlashingAPI`."""
+    """:class:`SlashingAPI`."""
 
     staking: StakingAPI
-    """:class:`StakingAPI`."""
+    """:class:`StakingAPI`."""
 
     tendermint: TendermintAPI
-    """:class:`TendermintAPI`."""
+    """:class:`TendermintAPI`."""
 
     treasury: TreasuryAPI
-    """:class:`TreasuryAPI`."""
+    """:class:`TreasuryAPI`."""
 
     wasm: WasmAPI
-    """:class:`WasmAPI`."""
+    """:class:`WasmAPI`."""
 
     tx: TxAPI
-    """:class:`TxAPI`."""
+    """:class:`TxAPI`."""
 
     ibc: IbcAPI
-    """:class:`IbcAPI`."""
+    """:class:`IbcAPI`."""
 
     ibc_transfer: IbcTransferAPI
-    """:class:`IbcTransferAPI`."""
+    """:class:`IbcTransferAPI`."""
 
     def __init__(
         self,
diff --git a/terra-classic_sdk/client/lcd/lcdutils.py b/terra_classic_sdk/client/lcd/lcdutils.py
similarity index 96%
rename from terra-classic_sdk/client/lcd/lcdutils.py
rename to terra_classic_sdk/client/lcd/lcdutils.py
index fc864fc..d23c0b8 100644
--- a/terra-classic_sdk/client/lcd/lcdutils.py
+++ b/terra_classic_sdk/client/lcd/lcdutils.py
@@ -2,7 +2,7 @@
 from math import ceil
 from typing import Any, Dict, Union
 
-from terra-classic_sdk.core import Coin
+from terra_classic_sdk.core import Coin
 
 from .api._base import BaseAsyncAPI, sync_bind
 
@@ -38,7 +38,7 @@ async def validators_with_voting_power(self) -> Dict[str, dict]:
         )
         next_key = ""
         while True:
-            from terra-classic_sdk.client.lcd import PaginationOptions
+            from terra_classic_sdk.client.lcd import PaginationOptions
 
             validators, pag = await BaseAsyncAPI._try_await(
                 self._c.staking.validators(PaginationOptions(key=next_key))
diff --git a/terra-classic_sdk/client/lcd/params.py b/terra_classic_sdk/client/lcd/params.py
similarity index 100%
rename from terra-classic_sdk/client/lcd/params.py
rename to terra_classic_sdk/client/lcd/params.py
diff --git a/terra-classic_sdk/client/lcd/wallet.py b/terra_classic_sdk/client/lcd/wallet.py
similarity index 97%
rename from terra-classic_sdk/client/lcd/wallet.py
rename to terra_classic_sdk/client/lcd/wallet.py
index aa85893..310075c 100644
--- a/terra-classic_sdk/client/lcd/wallet.py
+++ b/terra_classic_sdk/client/lcd/wallet.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from terra-classic_sdk.key.key import Key, SignOptions
+from terra_classic_sdk.key.key import Key, SignOptions
 
 from .api.tx import CreateTxOptions, SignerOptions
 
@@ -63,7 +63,7 @@ async def create_and_sign_tx(self, options: CreateTxOptions) -> Tx:
 class Wallet:
     """Wraps around a :class:`Key` implementation and provides transaction building and
     signing functionality. It is recommended to create this object through
-    :meth:`LCDClient.wallet()`."""
+    :meth:`LCDClient.wallet()`."""
 
     def __init__(self, lcd, key: Key):
         self.lcd = lcd
diff --git a/terra-classic_sdk/client/localterra.py b/terra_classic_sdk/client/localterra.py
similarity index 98%
rename from terra-classic_sdk/client/localterra.py
rename to terra_classic_sdk/client/localterra.py
index 8162efe..0e6e6f5 100644
--- a/terra-classic_sdk/client/localterra.py
+++ b/terra_classic_sdk/client/localterra.py
@@ -1,6 +1,6 @@
 from typing import Dict
 
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 from .lcd import AsyncLCDClient, AsyncWallet, LCDClient, Wallet
 
diff --git a/terra-classic_sdk/core/.DS_Store b/terra_classic_sdk/core/.DS_Store
similarity index 100%
rename from terra-classic_sdk/core/.DS_Store
rename to terra_classic_sdk/core/.DS_Store
diff --git a/terra-classic_sdk/core/__init__.py b/terra_classic_sdk/core/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/__init__.py
rename to terra_classic_sdk/core/__init__.py
diff --git a/terra-classic_sdk/core/auth/__init__.py b/terra_classic_sdk/core/auth/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/auth/__init__.py
rename to terra_classic_sdk/core/auth/__init__.py
diff --git a/terra-classic_sdk/core/auth/data/__init__.py b/terra_classic_sdk/core/auth/data/__init__.py
similarity index 70%
rename from terra-classic_sdk/core/auth/data/__init__.py
rename to terra_classic_sdk/core/auth/data/__init__.py
index bca5c63..050f03d 100644
--- a/terra-classic_sdk/core/auth/data/__init__.py
+++ b/terra_classic_sdk/core/auth/data/__init__.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.core.public_key import PublicKey
-from terra-classic_sdk.core.tx import TxInfo, TxLog, parse_tx_logs
+from terra_classic_sdk.core.public_key import PublicKey
+from terra_classic_sdk.core.tx import TxInfo, TxLog, parse_tx_logs
 
 from .account import Account
 from .base_account import BaseAccount
diff --git a/terra-classic_sdk/core/auth/data/account.py b/terra_classic_sdk/core/auth/data/account.py
similarity index 88%
rename from terra-classic_sdk/core/auth/data/account.py
rename to terra_classic_sdk/core/auth/data/account.py
index b16f7d0..2b37956 100644
--- a/terra-classic_sdk/core/auth/data/account.py
+++ b/terra_classic_sdk/core/auth/data/account.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 
-from terra-classic_sdk.core.public_key import PublicKey
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.public_key import PublicKey
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .base_account import BaseAccount
 from .lazy_graded_vesting_account import LazyGradedVestingAccount
diff --git a/terra-classic_sdk/core/auth/data/base_account.py b/terra_classic_sdk/core/auth/data/base_account.py
similarity index 100%
rename from terra-classic_sdk/core/auth/data/base_account.py
rename to terra_classic_sdk/core/auth/data/base_account.py
diff --git a/terra-classic_sdk/core/auth/data/base_vesting_account.py b/terra_classic_sdk/core/auth/data/base_vesting_account.py
similarity index 97%
rename from terra-classic_sdk/core/auth/data/base_vesting_account.py
rename to terra_classic_sdk/core/auth/data/base_vesting_account.py
index 93a1ca7..2400a97 100644
--- a/terra-classic_sdk/core/auth/data/base_vesting_account.py
+++ b/terra_classic_sdk/core/auth/data/base_vesting_account.py
@@ -7,8 +7,8 @@
     BaseVestingAccount as BaseVestingAccount_pb,
 )
 
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.util.json import JSONSerializable
 
 from ...public_key import PublicKey
 from .base_account import BaseAccount
diff --git a/terra-classic_sdk/core/auth/data/lazy_graded_vesting_account.py b/terra_classic_sdk/core/auth/data/lazy_graded_vesting_account.py
similarity index 98%
rename from terra-classic_sdk/core/auth/data/lazy_graded_vesting_account.py
rename to terra_classic_sdk/core/auth/data/lazy_graded_vesting_account.py
index 2d216ad..7236f3d 100644
--- a/terra-classic_sdk/core/auth/data/lazy_graded_vesting_account.py
+++ b/terra_classic_sdk/core/auth/data/lazy_graded_vesting_account.py
@@ -11,8 +11,8 @@
 from terra_proto.terra.vesting.v1beta1 import Schedule as Schedule_pb
 from terra_proto.terra.vesting.v1beta1 import VestingSchedule as VestingSchedule_pb
 
-from terra-classic_sdk.core import Dec
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import Dec
+from terra_classic_sdk.util.json import JSONSerializable
 
 from ...public_key import PublicKey
 from .base_account import BaseAccount
diff --git a/terra-classic_sdk/core/authz/__init__.py b/terra_classic_sdk/core/authz/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/authz/__init__.py
rename to terra_classic_sdk/core/authz/__init__.py
diff --git a/terra-classic_sdk/core/authz/data.py b/terra_classic_sdk/core/authz/data.py
similarity index 94%
rename from terra-classic_sdk/core/authz/data.py
rename to terra_classic_sdk/core/authz/data.py
index 30592be..39fc9c1 100644
--- a/terra-classic_sdk/core/authz/data.py
+++ b/terra_classic_sdk/core/authz/data.py
@@ -21,10 +21,10 @@
 )
 from betterproto.lib.google.protobuf import Any as Any_pb
 
-from terra-classic_sdk.core import AccAddress, Coin, Coins
-from terra-classic_sdk.util.base import BaseTerraData
-from terra-classic_sdk.util.converter import to_isoformat
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import AccAddress, Coin, Coins
+from terra_classic_sdk.util.base import BaseTerraData
+from terra_classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = [
     "Authorization",
@@ -41,32 +41,32 @@ class Authorization(BaseTerraData):
 
     @staticmethod
     def from_amino(amino: dict) -> Authorization:
-        from terra-classic_sdk.util.parse_authorization import parse_authorization_amino
+        from terra_classic_sdk.util.parse_authorization import parse_authorization_amino
 
         return parse_authorization_amino(amino)
 
     @staticmethod
     def from_data(data: dict) -> Authorization:
-        from terra-classic_sdk.util.parse_authorization import parse_authorization
+        from terra_classic_sdk.util.parse_authorization import parse_authorization
 
         return parse_authorization(data)
 
     @staticmethod
     def from_proto(proto: Any_pb) -> Authorization:
-        from terra-classic_sdk.util.parse_authorization import parse_authorization_proto
+        from terra_classic_sdk.util.parse_authorization import parse_authorization_proto
 
         return parse_authorization_proto(proto)
 
     @staticmethod
     def unpack_any(proto: Any_pb) -> Authorization:
-        from terra-classic_sdk.util.parse_authorization import parse_authorization_unpack_any
+        from terra_classic_sdk.util.parse_authorization import parse_authorization_unpack_any
 
         return parse_authorization_unpack_any(proto)
 
 
 @attr.s
 class SendAuthorization(Authorization):
-    """Type of :class:`Authorization` for :class:`MsgSend`,
+    """Type of :class:`Authorization` for :class:`MsgSend`,
     which can be parameterized by setting a ``spend_limit`` allowance for the grantee.
 
     Args:
diff --git a/terra-classic_sdk/core/authz/msgs.py b/terra_classic_sdk/core/authz/msgs.py
similarity index 98%
rename from terra-classic_sdk/core/authz/msgs.py
rename to terra_classic_sdk/core/authz/msgs.py
index 6bdc7d7..684e78b 100644
--- a/terra-classic_sdk/core/authz/msgs.py
+++ b/terra_classic_sdk/core/authz/msgs.py
@@ -11,8 +11,8 @@
 
 from betterproto.lib.google.protobuf import Any as Any_pb
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.msg import Msg
 
 from .data import Authorization, AuthorizationGrant
 
diff --git a/terra-classic_sdk/core/bank/__init__.py b/terra_classic_sdk/core/bank/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/bank/__init__.py
rename to terra_classic_sdk/core/bank/__init__.py
diff --git a/terra-classic_sdk/core/bank/msgs.py b/terra_classic_sdk/core/bank/msgs.py
similarity index 97%
rename from terra-classic_sdk/core/bank/msgs.py
rename to terra_classic_sdk/core/bank/msgs.py
index 25b72db..7c06df0 100644
--- a/terra-classic_sdk/core/bank/msgs.py
+++ b/terra_classic_sdk/core/bank/msgs.py
@@ -11,9 +11,9 @@
 
 from betterproto.lib.google.protobuf import Any as Any_pb
 
-from terra-classic_sdk.core import AccAddress, Coins
-from terra-classic_sdk.core.msg import Msg
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import AccAddress, Coins
+from terra_classic_sdk.core.msg import Msg
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["MsgSend", "MsgMultiSend", "MultiSendInput", "MultiSendOutput"]
 
diff --git a/terra-classic_sdk/core/bech32.py b/terra_classic_sdk/core/bech32.py
similarity index 100%
rename from terra-classic_sdk/core/bech32.py
rename to terra_classic_sdk/core/bech32.py
diff --git a/terra-classic_sdk/core/block.py b/terra_classic_sdk/core/block.py
similarity index 100%
rename from terra-classic_sdk/core/block.py
rename to terra_classic_sdk/core/block.py
diff --git a/terra-classic_sdk/core/broadcast.py b/terra_classic_sdk/core/broadcast.py
similarity index 95%
rename from terra-classic_sdk/core/broadcast.py
rename to terra_classic_sdk/core/broadcast.py
index 55ba680..6396ae9 100644
--- a/terra-classic_sdk/core/broadcast.py
+++ b/terra_classic_sdk/core/broadcast.py
@@ -6,8 +6,8 @@
 
 import attr
 
-from terra-classic_sdk.core.auth import TxLog, parse_tx_logs
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.auth import TxLog, parse_tx_logs
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = [
     "BlockTxBroadcastResult",
diff --git a/terra-classic_sdk/core/coin.py b/terra_classic_sdk/core/coin.py
similarity index 99%
rename from terra-classic_sdk/core/coin.py
rename to terra_classic_sdk/core/coin.py
index 43ed455..9f01abb 100644
--- a/terra-classic_sdk/core/coin.py
+++ b/terra_classic_sdk/core/coin.py
@@ -7,7 +7,7 @@
 import attr
 from terra_proto.cosmos.base.v1beta1 import Coin as Coin_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .numeric import Dec, Numeric
 
diff --git a/terra-classic_sdk/core/coins.py b/terra_classic_sdk/core/coins.py
similarity index 99%
rename from terra-classic_sdk/core/coins.py
rename to terra_classic_sdk/core/coins.py
index e9c993d..e8c036e 100644
--- a/terra-classic_sdk/core/coins.py
+++ b/terra_classic_sdk/core/coins.py
@@ -5,7 +5,7 @@
 
 from terra_proto.cosmos.base.v1beta1 import Coin as Coin_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .coin import Coin
 from .numeric import Numeric
diff --git a/terra-classic_sdk/core/compact_bit_array.py b/terra_classic_sdk/core/compact_bit_array.py
similarity index 98%
rename from terra-classic_sdk/core/compact_bit_array.py
rename to terra_classic_sdk/core/compact_bit_array.py
index a82ed14..074836f 100644
--- a/terra-classic_sdk/core/compact_bit_array.py
+++ b/terra_classic_sdk/core/compact_bit_array.py
@@ -9,7 +9,7 @@
     CompactBitArray as CompactBitArray_pb,
 )
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["CompactBitArray"]
 
diff --git a/terra-classic_sdk/core/crisis/__init__.py b/terra_classic_sdk/core/crisis/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/crisis/__init__.py
rename to terra_classic_sdk/core/crisis/__init__.py
diff --git a/terra-classic_sdk/core/crisis/msgs.py b/terra_classic_sdk/core/crisis/msgs.py
similarity index 95%
rename from terra-classic_sdk/core/crisis/msgs.py
rename to terra_classic_sdk/core/crisis/msgs.py
index cc9cda6..c717590 100644
--- a/terra-classic_sdk/core/crisis/msgs.py
+++ b/terra_classic_sdk/core/crisis/msgs.py
@@ -7,8 +7,8 @@
 )
 from betterproto.lib.google.protobuf import Any as Any_pb
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = ["MsgVerifyInvariant"]
 
diff --git a/terra-classic_sdk/core/deposit.py b/terra_classic_sdk/core/deposit.py
similarity index 90%
rename from terra-classic_sdk/core/deposit.py
rename to terra_classic_sdk/core/deposit.py
index 87926b9..33f4d09 100644
--- a/terra-classic_sdk/core/deposit.py
+++ b/terra_classic_sdk/core/deposit.py
@@ -3,8 +3,8 @@
 import attr
 from terra_proto.cosmos.gov.v1beta1 import Deposit as Deposit_pb
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .coins import Coins
 
diff --git a/terra-classic_sdk/core/distribution/__init__.py b/terra_classic_sdk/core/distribution/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/distribution/__init__.py
rename to terra_classic_sdk/core/distribution/__init__.py
diff --git a/terra-classic_sdk/core/distribution/msgs.py b/terra_classic_sdk/core/distribution/msgs.py
similarity index 98%
rename from terra-classic_sdk/core/distribution/msgs.py
rename to terra_classic_sdk/core/distribution/msgs.py
index 837cfdd..4ef117d 100644
--- a/terra-classic_sdk/core/distribution/msgs.py
+++ b/terra_classic_sdk/core/distribution/msgs.py
@@ -16,8 +16,8 @@
     MsgWithdrawValidatorCommission as MsgWithdrawValidatorCommission_pb,
 )
 
-from terra-classic_sdk.core import AccAddress, Coins, ValAddress
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress, Coins, ValAddress
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = [
     "MsgSetWithdrawAddress",
diff --git a/terra-classic_sdk/core/distribution/proposals.py b/terra_classic_sdk/core/distribution/proposals.py
similarity index 95%
rename from terra-classic_sdk/core/distribution/proposals.py
rename to terra_classic_sdk/core/distribution/proposals.py
index 22c3efb..405a72f 100644
--- a/terra-classic_sdk/core/distribution/proposals.py
+++ b/terra_classic_sdk/core/distribution/proposals.py
@@ -8,8 +8,8 @@
     CommunityPoolSpendProposal as CommunityPoolSpendProposal_pb,
 )
 
-from terra-classic_sdk.core import AccAddress, Coins
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import AccAddress, Coins
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["CommunityPoolSpendProposal"]
 
diff --git a/terra-classic_sdk/core/fee.py b/terra_classic_sdk/core/fee.py
similarity index 92%
rename from terra-classic_sdk/core/fee.py
rename to terra_classic_sdk/core/fee.py
index 5d1e944..a8229ae 100644
--- a/terra-classic_sdk/core/fee.py
+++ b/terra_classic_sdk/core/fee.py
@@ -7,9 +7,9 @@
 import attr
 from terra_proto.cosmos.tx.v1beta1 import Fee as Fee_pb
 
-from terra-classic_sdk.core.bech32 import AccAddress
-from terra-classic_sdk.core.coins import Coins
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.bech32 import AccAddress
+from terra_classic_sdk.core.coins import Coins
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["Fee"]
 
diff --git a/terra-classic_sdk/core/feegrant/__init__.py b/terra_classic_sdk/core/feegrant/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/feegrant/__init__.py
rename to terra_classic_sdk/core/feegrant/__init__.py
diff --git a/terra-classic_sdk/core/feegrant/data.py b/terra_classic_sdk/core/feegrant/data.py
similarity index 97%
rename from terra-classic_sdk/core/feegrant/data.py
rename to terra_classic_sdk/core/feegrant/data.py
index 62b638a..7db012f 100644
--- a/terra-classic_sdk/core/feegrant/data.py
+++ b/terra_classic_sdk/core/feegrant/data.py
@@ -16,9 +16,9 @@
     PeriodicAllowance as PeriodicAllowance_pb,
 )
 
-from terra-classic_sdk.core import Coins
-from terra-classic_sdk.util.converter import to_isoformat
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import Coins
+from terra_classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["BasicAllowance", "PeriodicAllowance", "AllowedMsgAllowance", "Allowance"]
 
diff --git a/terra-classic_sdk/core/feegrant/msgs.py b/terra_classic_sdk/core/feegrant/msgs.py
similarity index 96%
rename from terra-classic_sdk/core/feegrant/msgs.py
rename to terra_classic_sdk/core/feegrant/msgs.py
index cb08e81..582e336 100644
--- a/terra-classic_sdk/core/feegrant/msgs.py
+++ b/terra_classic_sdk/core/feegrant/msgs.py
@@ -10,8 +10,8 @@
     MsgRevokeAllowance as MsgRevokeAllowance_pb,
 )
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.msg import Msg
 
 from .data import Allowance
 
diff --git a/terra-classic_sdk/core/gov/__init__.py b/terra_classic_sdk/core/gov/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/gov/__init__.py
rename to terra_classic_sdk/core/gov/__init__.py
diff --git a/terra-classic_sdk/core/gov/data.py b/terra_classic_sdk/core/gov/data.py
similarity index 96%
rename from terra-classic_sdk/core/gov/data.py
rename to terra_classic_sdk/core/gov/data.py
index a47d7f2..0d4bc0c 100644
--- a/terra-classic_sdk/core/gov/data.py
+++ b/terra_classic_sdk/core/gov/data.py
@@ -12,10 +12,10 @@
 from terra_proto.cosmos.gov.v1beta1 import VoteOption
 from terra_proto.cosmos.gov.v1beta1 import WeightedVoteOption as WeightedVoteOption_pb
 
-from terra-classic_sdk.core import AccAddress, Coins
-from terra-classic_sdk.util.json import JSONSerializable
-from terra-classic_sdk.util.converter import to_isoformat
-from terra-classic_sdk.util.parse_content import parse_content, Content
+from terra_classic_sdk.core import AccAddress, Coins
+from terra_classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.parse_content import parse_content, Content
 
 __all__ = ["Proposal", "Content", "VoteOption", "WeightedVoteOption", "ProposalStatus"]
 
diff --git a/terra-classic_sdk/core/gov/msgs.py b/terra_classic_sdk/core/gov/msgs.py
similarity index 96%
rename from terra-classic_sdk/core/gov/msgs.py
rename to terra_classic_sdk/core/gov/msgs.py
index b23b7ba..6a76bff 100644
--- a/terra-classic_sdk/core/gov/msgs.py
+++ b/terra_classic_sdk/core/gov/msgs.py
@@ -7,8 +7,8 @@
 from terra_proto.cosmos.gov.v1beta1 import MsgSubmitProposal as MsgSubmitProposal_pb
 from terra_proto.cosmos.gov.v1beta1 import MsgVote as MsgVote_pb
 
-from terra-classic_sdk.core import AccAddress, Coins
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress, Coins
+from terra_classic_sdk.core.msg import Msg
 
 from .data import Content, VoteOption
 
@@ -58,7 +58,7 @@ def to_data(self) -> dict:
 
     @classmethod
     def from_data(cls, data: dict) -> MsgSubmitProposal:
-        from terra-classic_sdk.util.parse_content import parse_content
+        from terra_classic_sdk.util.parse_content import parse_content
 
         content = parse_content(data["content"])
         return cls(
@@ -76,7 +76,7 @@ def to_proto(self) -> MsgSubmitProposal_pb:
 
     @classmethod
     def from_proto(cls, proto: MsgSubmitProposal_pb) -> MsgSubmitProposal:
-        from terra-classic_sdk.util.parse_content import parse_content_proto
+        from terra_classic_sdk.util.parse_content import parse_content_proto
         content = parse_content_proto(proto.content)
         return cls(
             content=content,
diff --git a/terra-classic_sdk/core/gov/proposals.py b/terra_classic_sdk/core/gov/proposals.py
similarity index 96%
rename from terra-classic_sdk/core/gov/proposals.py
rename to terra_classic_sdk/core/gov/proposals.py
index d9692b2..1abe716 100644
--- a/terra-classic_sdk/core/gov/proposals.py
+++ b/terra_classic_sdk/core/gov/proposals.py
@@ -6,7 +6,7 @@
 from betterproto.lib.google.protobuf import Any as Any_pb
 from terra_proto.cosmos.gov.v1beta1 import TextProposal as TextProposal_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["TextProposal"]
 
diff --git a/terra-classic_sdk/core/ibc/.DS_Store b/terra_classic_sdk/core/ibc/.DS_Store
similarity index 100%
rename from terra-classic_sdk/core/ibc/.DS_Store
rename to terra_classic_sdk/core/ibc/.DS_Store
diff --git a/terra-classic_sdk/core/ibc/__init__.py b/terra_classic_sdk/core/ibc/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/ibc/__init__.py
rename to terra_classic_sdk/core/ibc/__init__.py
diff --git a/terra-classic_sdk/core/ibc/data/__init__.py b/terra_classic_sdk/core/ibc/data/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/ibc/data/__init__.py
rename to terra_classic_sdk/core/ibc/data/__init__.py
diff --git a/terra-classic_sdk/core/ibc/data/channel.py b/terra_classic_sdk/core/ibc/data/channel.py
similarity index 97%
rename from terra-classic_sdk/core/ibc/data/channel.py
rename to terra_classic_sdk/core/ibc/data/channel.py
index 4fbe0ce..fbec716 100644
--- a/terra-classic_sdk/core/ibc/data/channel.py
+++ b/terra_classic_sdk/core/ibc/data/channel.py
@@ -10,8 +10,8 @@
 from terra_proto.ibc.core.channel.v1 import Packet as Packet_pb
 from terra_proto.ibc.core.channel.v1 import State
 
-from terra-classic_sdk.core.ibc.data.client import Height
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.ibc.data.client import Height
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["Counterparty", "Channel", "Order", "State", "Packet"]
 
diff --git a/terra-classic_sdk/core/ibc/data/client.py b/terra_classic_sdk/core/ibc/data/client.py
similarity index 98%
rename from terra-classic_sdk/core/ibc/data/client.py
rename to terra_classic_sdk/core/ibc/data/client.py
index 52eb86d..66723a3 100644
--- a/terra-classic_sdk/core/ibc/data/client.py
+++ b/terra_classic_sdk/core/ibc/data/client.py
@@ -17,7 +17,7 @@
 )
 from terra_proto.ibc.core.client.v1 import Params as Params_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = [
     "Height",
diff --git a/terra-classic_sdk/core/ibc/data/commitment.py b/terra_classic_sdk/core/ibc/data/commitment.py
similarity index 95%
rename from terra-classic_sdk/core/ibc/data/commitment.py
rename to terra_classic_sdk/core/ibc/data/commitment.py
index 6117bbb..3b41bf3 100644
--- a/terra-classic_sdk/core/ibc/data/commitment.py
+++ b/terra_classic_sdk/core/ibc/data/commitment.py
@@ -7,7 +7,7 @@
 from terra_proto.ibc.core.commitment.v1 import MerklePrefix as MerklePrefix_pb
 from terra_proto.ibc.core.commitment.v1 import MerkleRoot as MerkleRoot_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["MerkleRoot", "MerklePrefix"]
 
diff --git a/terra-classic_sdk/core/ibc/data/connection.py b/terra_classic_sdk/core/ibc/data/connection.py
similarity index 97%
rename from terra-classic_sdk/core/ibc/data/connection.py
rename to terra_classic_sdk/core/ibc/data/connection.py
index 89c06bc..1425fcc 100644
--- a/terra-classic_sdk/core/ibc/data/connection.py
+++ b/terra_classic_sdk/core/ibc/data/connection.py
@@ -7,7 +7,7 @@
 from terra_proto.ibc.core.connection.v1 import Counterparty as Counterparty_pb
 from terra_proto.ibc.core.connection.v1 import Version as Version_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .commitment import MerklePrefix
 
diff --git a/terra-classic_sdk/core/ibc/msgs/__init__.py b/terra_classic_sdk/core/ibc/msgs/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/ibc/msgs/__init__.py
rename to terra_classic_sdk/core/ibc/msgs/__init__.py
diff --git a/terra-classic_sdk/core/ibc/msgs/channel.py b/terra_classic_sdk/core/ibc/msgs/channel.py
similarity index 98%
rename from terra-classic_sdk/core/ibc/msgs/channel.py
rename to terra_classic_sdk/core/ibc/msgs/channel.py
index 45e5415..de1c14b 100644
--- a/terra-classic_sdk/core/ibc/msgs/channel.py
+++ b/terra_classic_sdk/core/ibc/msgs/channel.py
@@ -19,9 +19,9 @@
 from terra_proto.ibc.core.channel.v1 import MsgRecvPacket as MsgRecvPacket_pb
 from terra_proto.ibc.core.channel.v1 import MsgTimeout as MsgTimeout_pb
 
-from terra-classic_sdk.core.ibc.data.channel import Channel, Packet
-from terra-classic_sdk.core.ibc.data.client import Height
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core.ibc.data.channel import Channel, Packet
+from terra_classic_sdk.core.ibc.data.client import Height
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = [
     "MsgChannelOpenInit",
diff --git a/terra-classic_sdk/core/ibc/msgs/client.py b/terra_classic_sdk/core/ibc/msgs/client.py
similarity index 99%
rename from terra-classic_sdk/core/ibc/msgs/client.py
rename to terra_classic_sdk/core/ibc/msgs/client.py
index 4b11fbc..20f63db 100644
--- a/terra-classic_sdk/core/ibc/msgs/client.py
+++ b/terra_classic_sdk/core/ibc/msgs/client.py
@@ -11,7 +11,7 @@
 from terra_proto.ibc.core.client.v1 import MsgUpdateClient as MsgUpdateClient_pb
 from terra_proto.ibc.core.client.v1 import MsgUpgradeClient as MsgUpgradeClient_pb
 
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = [
     "MsgCreateClient",
diff --git a/terra-classic_sdk/core/ibc/msgs/connection.py b/terra_classic_sdk/core/ibc/msgs/connection.py
similarity index 97%
rename from terra-classic_sdk/core/ibc/msgs/connection.py
rename to terra_classic_sdk/core/ibc/msgs/connection.py
index db56519..fc79898 100644
--- a/terra-classic_sdk/core/ibc/msgs/connection.py
+++ b/terra_classic_sdk/core/ibc/msgs/connection.py
@@ -19,10 +19,10 @@
     MsgConnectionOpenTry as MsgConnectionOpenTry_pb,
 )
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.ibc.data import Height
-from terra-classic_sdk.core.ibc.data.connection import Counterparty, Version
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.ibc.data import Height
+from terra_classic_sdk.core.ibc.data.connection import Counterparty, Version
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = [
     "MsgConnectionOpenInit",
diff --git a/terra-classic_sdk/core/ibc/proposals/__init__.py b/terra_classic_sdk/core/ibc/proposals/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/ibc/proposals/__init__.py
rename to terra_classic_sdk/core/ibc/proposals/__init__.py
diff --git a/terra-classic_sdk/core/ibc/proposals/proposals.py b/terra_classic_sdk/core/ibc/proposals/proposals.py
similarity index 97%
rename from terra-classic_sdk/core/ibc/proposals/proposals.py
rename to terra_classic_sdk/core/ibc/proposals/proposals.py
index 60b411a..9d3d742 100644
--- a/terra-classic_sdk/core/ibc/proposals/proposals.py
+++ b/terra_classic_sdk/core/ibc/proposals/proposals.py
@@ -6,7 +6,7 @@
 
 __all__ = ["ClientUpdateProposal"]
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 
 @attr.s
diff --git a/terra-classic_sdk/core/ibc_transfer/__init__.py b/terra_classic_sdk/core/ibc_transfer/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/ibc_transfer/__init__.py
rename to terra_classic_sdk/core/ibc_transfer/__init__.py
diff --git a/terra-classic_sdk/core/ibc_transfer/data.py b/terra_classic_sdk/core/ibc_transfer/data.py
similarity index 91%
rename from terra-classic_sdk/core/ibc_transfer/data.py
rename to terra_classic_sdk/core/ibc_transfer/data.py
index b2d52ba..803a7e9 100644
--- a/terra-classic_sdk/core/ibc_transfer/data.py
+++ b/terra_classic_sdk/core/ibc_transfer/data.py
@@ -4,7 +4,7 @@
 import attr
 from terra_proto.ibc.applications.transfer.v1 import DenomTrace as DenomTrace_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["DenomTrace"]
 
diff --git a/terra-classic_sdk/core/ibc_transfer/msgs.py b/terra_classic_sdk/core/ibc_transfer/msgs.py
similarity index 95%
rename from terra-classic_sdk/core/ibc_transfer/msgs.py
rename to terra_classic_sdk/core/ibc_transfer/msgs.py
index 4e3a40c..0944340 100644
--- a/terra-classic_sdk/core/ibc_transfer/msgs.py
+++ b/terra_classic_sdk/core/ibc_transfer/msgs.py
@@ -5,9 +5,9 @@
 import attr
 from terra_proto.ibc.applications.transfer.v1 import MsgTransfer as MsgTransfer_pb
 
-from terra-classic_sdk.core import AccAddress, Coin
-from terra-classic_sdk.core.ibc.data import Height
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress, Coin
+from terra_classic_sdk.core.ibc.data import Height
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = ["MsgTransfer"]
 
diff --git a/terra-classic_sdk/core/market/__init__.py b/terra_classic_sdk/core/market/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/market/__init__.py
rename to terra_classic_sdk/core/market/__init__.py
diff --git a/terra-classic_sdk/core/market/msgs.py b/terra_classic_sdk/core/market/msgs.py
similarity index 97%
rename from terra-classic_sdk/core/market/msgs.py
rename to terra_classic_sdk/core/market/msgs.py
index a7a2ea2..1ee820e 100644
--- a/terra-classic_sdk/core/market/msgs.py
+++ b/terra_classic_sdk/core/market/msgs.py
@@ -6,8 +6,8 @@
 from terra_proto.terra.market.v1beta1 import MsgSwap as MsgSwap_pb
 from terra_proto.terra.market.v1beta1 import MsgSwapSend as MsgSwapSend_pb
 
-from terra-classic_sdk.core import AccAddress, Coin
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress, Coin
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = ["MsgSwap", "MsgSwapSend"]
 
diff --git a/terra-classic_sdk/core/mode_info.py b/terra_classic_sdk/core/mode_info.py
similarity index 98%
rename from terra-classic_sdk/core/mode_info.py
rename to terra_classic_sdk/core/mode_info.py
index 53d519a..a33bfcc 100644
--- a/terra-classic_sdk/core/mode_info.py
+++ b/terra_classic_sdk/core/mode_info.py
@@ -9,7 +9,7 @@
 from terra_proto.cosmos.tx.v1beta1 import ModeInfoMulti as ModeInfoMulti_pb
 from terra_proto.cosmos.tx.v1beta1 import ModeInfoSingle as ModeInfoSingle_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .compact_bit_array import CompactBitArray
 
diff --git a/terra-classic_sdk/core/msg.py b/terra_classic_sdk/core/msg.py
similarity index 70%
rename from terra-classic_sdk/core/msg.py
rename to terra_classic_sdk/core/msg.py
index 2e55711..6bb1022 100644
--- a/terra-classic_sdk/core/msg.py
+++ b/terra_classic_sdk/core/msg.py
@@ -2,7 +2,7 @@
 
 from betterproto.lib.google.protobuf import Any as Any_pb
 
-from terra-classic_sdk.util.base import BaseTerraData
+from terra_classic_sdk.util.base import BaseTerraData
 
 
 class Msg(BaseTerraData):
@@ -14,18 +14,18 @@ def pack_any(self) -> Any_pb:
 
     @staticmethod
     def from_data(data: dict) -> Msg:
-        from terra-classic_sdk.util.parse_msg import parse_msg
+        from terra_classic_sdk.util.parse_msg import parse_msg
 
         return parse_msg(data)
 
     @staticmethod
     def from_proto(proto: any) -> Msg:
-        from terra-classic_sdk.util.parse_msg import parse_proto
+        from terra_classic_sdk.util.parse_msg import parse_proto
 
         return parse_proto(proto)
 
     @staticmethod
     def unpack_any(any_pb: Any_pb) -> Msg:
-        from terra-classic_sdk.util.parse_msg import parse_unpack_any
+        from terra_classic_sdk.util.parse_msg import parse_unpack_any
 
         return parse_unpack_any(any_pb)
diff --git a/terra-classic_sdk/core/multisig.py b/terra_classic_sdk/core/multisig.py
similarity index 84%
rename from terra-classic_sdk/core/multisig.py
rename to terra_classic_sdk/core/multisig.py
index ad31f6c..4aea62d 100644
--- a/terra-classic_sdk/core/multisig.py
+++ b/terra_classic_sdk/core/multisig.py
@@ -6,12 +6,12 @@
 
 import attr
 
-from terra-classic_sdk.core.compact_bit_array import CompactBitArray
-from terra-classic_sdk.core.public_key import LegacyAminoMultisigPublicKey, SimplePublicKey
-from terra-classic_sdk.core.signature_v2 import Descriptor
-from terra-classic_sdk.core.signature_v2 import Multi as MultiDescriptor
-from terra-classic_sdk.core.signature_v2 import SignatureV2
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.compact_bit_array import CompactBitArray
+from terra_classic_sdk.core.public_key import LegacyAminoMultisigPublicKey, SimplePublicKey
+from terra_classic_sdk.core.signature_v2 import Descriptor
+from terra_classic_sdk.core.signature_v2 import Multi as MultiDescriptor
+from terra_classic_sdk.core.signature_v2 import SignatureV2
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["MultiSignature"]
 
diff --git a/terra-classic_sdk/core/numeric.py b/terra_classic_sdk/core/numeric.py
similarity index 99%
rename from terra-classic_sdk/core/numeric.py
rename to terra_classic_sdk/core/numeric.py
index 6235132..5ad52e0 100644
--- a/terra-classic_sdk/core/numeric.py
+++ b/terra_classic_sdk/core/numeric.py
@@ -6,7 +6,7 @@
 from decimal import Decimal
 from typing import Union
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 DEC_NUM_DIGITS = 18
 """Number of digits for Decimal."""
diff --git a/terra-classic_sdk/core/oracle/__init__.py b/terra_classic_sdk/core/oracle/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/oracle/__init__.py
rename to terra_classic_sdk/core/oracle/__init__.py
diff --git a/terra-classic_sdk/core/oracle/data.py b/terra_classic_sdk/core/oracle/data.py
similarity index 96%
rename from terra-classic_sdk/core/oracle/data.py
rename to terra_classic_sdk/core/oracle/data.py
index 2d79ba9..dcf7579 100644
--- a/terra-classic_sdk/core/oracle/data.py
+++ b/terra_classic_sdk/core/oracle/data.py
@@ -10,8 +10,8 @@
     AggregateExchangeRateVote as AggregateExchangeRateVote_pb,
 )
 
-from terra-classic_sdk.core import Coin, Coins, ValAddress
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import Coin, Coins, ValAddress
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = [
     "AggregateExchangeRatePrevote",
diff --git a/terra-classic_sdk/core/oracle/msgs.py b/terra_classic_sdk/core/oracle/msgs.py
similarity index 98%
rename from terra-classic_sdk/core/oracle/msgs.py
rename to terra_classic_sdk/core/oracle/msgs.py
index d7f1642..a8e67f3 100644
--- a/terra-classic_sdk/core/oracle/msgs.py
+++ b/terra_classic_sdk/core/oracle/msgs.py
@@ -15,8 +15,8 @@
     MsgDelegateFeedConsent as MsgDelegateFeedConsent_pb,
 )
 
-from terra-classic_sdk.core import AccAddress, Coins, Dec, ValAddress
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress, Coins, Dec, ValAddress
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = [
     "vote_hash",
diff --git a/terra-classic_sdk/core/params/__init__.py b/terra_classic_sdk/core/params/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/params/__init__.py
rename to terra_classic_sdk/core/params/__init__.py
diff --git a/terra-classic_sdk/core/params/proposals.py b/terra_classic_sdk/core/params/proposals.py
similarity index 98%
rename from terra-classic_sdk/core/params/proposals.py
rename to terra_classic_sdk/core/params/proposals.py
index 475fab9..5e01a79 100644
--- a/terra-classic_sdk/core/params/proposals.py
+++ b/terra_classic_sdk/core/params/proposals.py
@@ -11,7 +11,7 @@
     ParameterChangeProposal as ParameterChangeProposal_pb,
 )
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["ParameterChangeProposal", "ParamChange"]
 
diff --git a/terra-classic_sdk/core/public_key.py b/terra_classic_sdk/core/public_key.py
similarity index 99%
rename from terra-classic_sdk/core/public_key.py
rename to terra_classic_sdk/core/public_key.py
index 010bad8..7b2842b 100644
--- a/terra-classic_sdk/core/public_key.py
+++ b/terra_classic_sdk/core/public_key.py
@@ -11,7 +11,7 @@
 from terra_proto.cosmos.crypto.multisig import LegacyAminoPubKey as LegacyAminoPubKey_pb
 from terra_proto.cosmos.crypto.secp256k1 import PubKey as SimplePubKey_pb
 
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.json import JSONSerializable
 
 from .bech32 import get_bech
 
diff --git a/terra-classic_sdk/core/sign_doc.py b/terra_classic_sdk/core/sign_doc.py
similarity index 93%
rename from terra-classic_sdk/core/sign_doc.py
rename to terra_classic_sdk/core/sign_doc.py
index 54908ee..591d399 100644
--- a/terra-classic_sdk/core/sign_doc.py
+++ b/terra_classic_sdk/core/sign_doc.py
@@ -7,12 +7,12 @@
 import attr
 from terra_proto.cosmos.tx.v1beta1 import SignDoc as SignDoc_pb
 
-from terra-classic_sdk.core.tx import AuthInfo, TxBody
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.tx import AuthInfo, TxBody
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["SignDoc"]
 
-from terra-classic_sdk.util.remove_none import remove_none
+from terra_classic_sdk.util.remove_none import remove_none
 
 
 @attr.s
diff --git a/terra-classic_sdk/core/signature_v2.py b/terra_classic_sdk/core/signature_v2.py
similarity index 100%
rename from terra-classic_sdk/core/signature_v2.py
rename to terra_classic_sdk/core/signature_v2.py
diff --git a/terra-classic_sdk/core/slashing/__init__.py b/terra_classic_sdk/core/slashing/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/slashing/__init__.py
rename to terra_classic_sdk/core/slashing/__init__.py
diff --git a/terra-classic_sdk/core/slashing/msgs.py b/terra_classic_sdk/core/slashing/msgs.py
similarity index 91%
rename from terra-classic_sdk/core/slashing/msgs.py
rename to terra_classic_sdk/core/slashing/msgs.py
index 27250ba..d0a4283 100644
--- a/terra-classic_sdk/core/slashing/msgs.py
+++ b/terra_classic_sdk/core/slashing/msgs.py
@@ -5,8 +5,8 @@
 import attr
 from terra_proto.cosmos.slashing.v1beta1 import MsgUnjail as MsgUnjail_pb
 
-from terra-classic_sdk.core import ValAddress
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import ValAddress
+from terra_classic_sdk.core.msg import Msg
 
 __all__ = ["MsgUnjail"]
 
diff --git a/terra-classic_sdk/core/staking/__init__.py b/terra_classic_sdk/core/staking/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/staking/__init__.py
rename to terra_classic_sdk/core/staking/__init__.py
diff --git a/terra-classic_sdk/core/staking/data/__init__.py b/terra_classic_sdk/core/staking/data/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/staking/data/__init__.py
rename to terra_classic_sdk/core/staking/data/__init__.py
diff --git a/terra-classic_sdk/core/staking/data/delegation.py b/terra_classic_sdk/core/staking/data/delegation.py
similarity index 98%
rename from terra-classic_sdk/core/staking/data/delegation.py
rename to terra_classic_sdk/core/staking/data/delegation.py
index 29cf876..1d9ed75 100644
--- a/terra-classic_sdk/core/staking/data/delegation.py
+++ b/terra_classic_sdk/core/staking/data/delegation.py
@@ -21,9 +21,9 @@
     UnbondingDelegationEntry as UnbondingDelegationEntry_pb,
 )
 
-from terra-classic_sdk.core import AccAddress, Coin, Dec, ValAddress
-from terra-classic_sdk.util.converter import to_isoformat
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import AccAddress, Coin, Dec, ValAddress
+from terra_classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = [
     "Delegation",
diff --git a/terra-classic_sdk/core/staking/data/validator.py b/terra_classic_sdk/core/staking/data/validator.py
similarity index 97%
rename from terra-classic_sdk/core/staking/data/validator.py
rename to terra_classic_sdk/core/staking/data/validator.py
index 73e009a..930a429 100644
--- a/terra-classic_sdk/core/staking/data/validator.py
+++ b/terra_classic_sdk/core/staking/data/validator.py
@@ -10,9 +10,9 @@
 from terra_proto.cosmos.staking.v1beta1 import Description as Description_pb
 from terra_proto.cosmos.staking.v1beta1 import Validator as Validator_pb
 
-from terra-classic_sdk.core import Dec, ValAddress, ValConsPubKey
-from terra-classic_sdk.util.converter import to_isoformat
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import Dec, ValAddress, ValConsPubKey
+from terra_classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = ["CommissionRates", "Commission", "Description", "Validator", "BondStatus"]
 
diff --git a/terra-classic_sdk/core/staking/msgs.py b/terra_classic_sdk/core/staking/msgs.py
similarity index 99%
rename from terra-classic_sdk/core/staking/msgs.py
rename to terra_classic_sdk/core/staking/msgs.py
index 590720e..a19ed1b 100644
--- a/terra-classic_sdk/core/staking/msgs.py
+++ b/terra_classic_sdk/core/staking/msgs.py
@@ -15,8 +15,8 @@
 from terra_proto.cosmos.staking.v1beta1 import MsgEditValidator as MsgEditValidator_pb
 from terra_proto.cosmos.staking.v1beta1 import MsgUndelegate as MsgUndelegate_pb
 
-from terra-classic_sdk.core import AccAddress, Coin, Dec, ValAddress, ValConsPubKey
-from terra-classic_sdk.core.msg import Msg
+from terra_classic_sdk.core import AccAddress, Coin, Dec, ValAddress, ValConsPubKey
+from terra_classic_sdk.core.msg import Msg
 
 from .data import CommissionRates, Description
 
diff --git a/terra-classic_sdk/core/treasury/__init__.py b/terra_classic_sdk/core/treasury/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/treasury/__init__.py
rename to terra_classic_sdk/core/treasury/__init__.py
diff --git a/terra-classic_sdk/core/treasury/data.py b/terra_classic_sdk/core/treasury/data.py
similarity index 95%
rename from terra-classic_sdk/core/treasury/data.py
rename to terra_classic_sdk/core/treasury/data.py
index 6724a7f..c1435b2 100644
--- a/terra-classic_sdk/core/treasury/data.py
+++ b/terra_classic_sdk/core/treasury/data.py
@@ -7,8 +7,8 @@
 import attr
 from terra_proto.terra.treasury.v1beta1 import PolicyConstraints as PolicyConstraints_pb
 
-from terra-classic_sdk.core import Coin, Dec
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core import Coin, Dec
+from terra_classic_sdk.util.json import JSONSerializable
 
 
 @attr.s
diff --git a/terra-classic_sdk/core/tx.py b/terra_classic_sdk/core/tx.py
similarity index 96%
rename from terra-classic_sdk/core/tx.py
rename to terra_classic_sdk/core/tx.py
index 2a00492..3078de1 100644
--- a/terra-classic_sdk/core/tx.py
+++ b/terra_classic_sdk/core/tx.py
@@ -18,17 +18,17 @@
 from terra_proto.cosmos.tx.v1beta1 import Tx as Tx_pb
 from terra_proto.cosmos.tx.v1beta1 import TxBody as TxBody_pb
 
-from terra-classic_sdk.core.compact_bit_array import CompactBitArray
-from terra-classic_sdk.core.fee import Fee
-from terra-classic_sdk.core.mode_info import ModeInfo, ModeInfoMulti, ModeInfoSingle
-from terra-classic_sdk.core.msg import Msg
-from terra-classic_sdk.core.public_key import (
+from terra_classic_sdk.core.compact_bit_array import CompactBitArray
+from terra_classic_sdk.core.fee import Fee
+from terra_classic_sdk.core.mode_info import ModeInfo, ModeInfoMulti, ModeInfoSingle
+from terra_classic_sdk.core.msg import Msg
+from terra_classic_sdk.core.public_key import (
     LegacyAminoMultisigPublicKey,
     PublicKey,
     SimplePublicKey,
 )
-from terra-classic_sdk.core.signature_v2 import SignatureV2
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.signature_v2 import SignatureV2
+from terra_classic_sdk.util.json import JSONSerializable
 
 __all__ = [
     "SignMode",
@@ -43,7 +43,7 @@
 ]
 
 # just alias
-from terra-classic_sdk.util.parse_msg import parse_proto
+from terra_classic_sdk.util.parse_msg import parse_proto
 
 SignMode = SignMode_pb
 
@@ -387,7 +387,7 @@ class TxInfo(JSONSerializable):
 
     .. note::
         Users are not expected to create this object directly. It is returned by
-        :meth:`TxAPI.tx_info()`
+        :meth:`TxAPI.tx_info()`
     """
 
     height: int = attr.ib(converter=int)
diff --git a/terra-classic_sdk/core/upgrade/__init__.py b/terra_classic_sdk/core/upgrade/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/upgrade/__init__.py
rename to terra_classic_sdk/core/upgrade/__init__.py
diff --git a/terra-classic_sdk/core/upgrade/data/__init__.py b/terra_classic_sdk/core/upgrade/data/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/upgrade/data/__init__.py
rename to terra_classic_sdk/core/upgrade/data/__init__.py
diff --git a/terra-classic_sdk/core/upgrade/data/proposal.py b/terra_classic_sdk/core/upgrade/data/proposal.py
similarity index 96%
rename from terra-classic_sdk/core/upgrade/data/proposal.py
rename to terra_classic_sdk/core/upgrade/data/proposal.py
index 014733b..2c2bb88 100644
--- a/terra-classic_sdk/core/upgrade/data/proposal.py
+++ b/terra_classic_sdk/core/upgrade/data/proposal.py
@@ -15,8 +15,8 @@
     SoftwareUpgradeProposal as SoftwareUpgradeProposal_pb,
 )
 
-from terra-classic_sdk.core.upgrade.plan import Plan
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.core.upgrade.plan import Plan
+from terra_classic_sdk.util.json import JSONSerializable
 
 
 @attr.s
diff --git a/terra-classic_sdk/core/upgrade/plan.py b/terra_classic_sdk/core/upgrade/plan.py
similarity index 94%
rename from terra-classic_sdk/core/upgrade/plan.py
rename to terra_classic_sdk/core/upgrade/plan.py
index 9e533eb..0cf2410 100644
--- a/terra-classic_sdk/core/upgrade/plan.py
+++ b/terra_classic_sdk/core/upgrade/plan.py
@@ -12,8 +12,8 @@
 from dateutil.parser import parse
 from terra_proto.cosmos.upgrade.v1beta1 import Plan as Plan_pb
 
-from terra-classic_sdk.util.converter import to_isoformat
-from terra-classic_sdk.util.json import JSONSerializable
+from terra_classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.json import JSONSerializable
 
 
 @attr.s
diff --git a/terra-classic_sdk/core/wasm/__init__.py b/terra_classic_sdk/core/wasm/__init__.py
similarity index 100%
rename from terra-classic_sdk/core/wasm/__init__.py
rename to terra_classic_sdk/core/wasm/__init__.py
diff --git a/terra-classic_sdk/core/wasm/msgs.py b/terra_classic_sdk/core/wasm/msgs.py
similarity index 98%
rename from terra-classic_sdk/core/wasm/msgs.py
rename to terra_classic_sdk/core/wasm/msgs.py
index 1d3e7ee..64b7505 100644
--- a/terra-classic_sdk/core/wasm/msgs.py
+++ b/terra_classic_sdk/core/wasm/msgs.py
@@ -22,9 +22,9 @@
 )
 from betterproto.lib.google.protobuf import Any as Any_pb
 
-from terra-classic_sdk.core import AccAddress, Coins
-from terra-classic_sdk.core.msg import Msg
-from terra-classic_sdk.util.remove_none import remove_none
+from terra_classic_sdk.core import AccAddress, Coins
+from terra_classic_sdk.core.msg import Msg
+from terra_classic_sdk.util.remove_none import remove_none
 
 __all__ = [
     "MsgStoreCode",
diff --git a/terra-classic_sdk/exceptions.py b/terra_classic_sdk/exceptions.py
similarity index 100%
rename from terra-classic_sdk/exceptions.py
rename to terra_classic_sdk/exceptions.py
diff --git a/terra-classic_sdk/key/__init__.py b/terra_classic_sdk/key/__init__.py
similarity index 100%
rename from terra-classic_sdk/key/__init__.py
rename to terra_classic_sdk/key/__init__.py
diff --git a/terra-classic_sdk/key/key.py b/terra_classic_sdk/key/key.py
similarity index 95%
rename from terra-classic_sdk/key/key.py
rename to terra_classic_sdk/key/key.py
index 72dd383..30c57a6 100644
--- a/terra-classic_sdk/key/key.py
+++ b/terra_classic_sdk/key/key.py
@@ -4,7 +4,7 @@
 
 import attr
 
-from terra-classic_sdk.core import (
+from terra_classic_sdk.core import (
     AccAddress,
     AccPubKey,
     ModeInfo,
@@ -14,15 +14,15 @@
     ValAddress,
     ValPubKey,
 )
-from terra-classic_sdk.core.bech32 import get_bech
-from terra-classic_sdk.core.public_key import (
+from terra_classic_sdk.core.bech32 import get_bech
+from terra_classic_sdk.core.public_key import (
     PublicKey,
     address_from_public_key,
     amino_pubkey_from_public_key,
 )
-from terra-classic_sdk.core.signature_v2 import Descriptor
-from terra-classic_sdk.core.signature_v2 import Single as SingleDescriptor
-from terra-classic_sdk.core.tx import AuthInfo, SignerInfo, SignMode, Tx
+from terra_classic_sdk.core.signature_v2 import Descriptor
+from terra_classic_sdk.core.signature_v2 import Single as SingleDescriptor
+from terra_classic_sdk.core.tx import AuthInfo, SignerInfo, SignMode, Tx
 
 __all__ = ["Key", "SignOptions"]
 
diff --git a/terra-classic_sdk/key/mnemonic.py b/terra_classic_sdk/key/mnemonic.py
similarity index 100%
rename from terra-classic_sdk/key/mnemonic.py
rename to terra_classic_sdk/key/mnemonic.py
diff --git a/terra-classic_sdk/key/raw.py b/terra_classic_sdk/key/raw.py
similarity index 100%
rename from terra-classic_sdk/key/raw.py
rename to terra_classic_sdk/key/raw.py
diff --git a/terra-classic_sdk/util/__init__.py b/terra_classic_sdk/util/__init__.py
similarity index 100%
rename from terra-classic_sdk/util/__init__.py
rename to terra_classic_sdk/util/__init__.py
diff --git a/terra-classic_sdk/util/base.py b/terra_classic_sdk/util/base.py
similarity index 100%
rename from terra-classic_sdk/util/base.py
rename to terra_classic_sdk/util/base.py
diff --git a/terra-classic_sdk/util/contract.py b/terra_classic_sdk/util/contract.py
similarity index 95%
rename from terra-classic_sdk/util/contract.py
rename to terra_classic_sdk/util/contract.py
index 955497f..2dbe908 100644
--- a/terra-classic_sdk/util/contract.py
+++ b/terra_classic_sdk/util/contract.py
@@ -3,9 +3,9 @@
 import base64
 from typing import Dict, List, Union
 
-from terra-classic_sdk.core import AccAddress
-from terra-classic_sdk.core.auth import TxInfo
-from terra-classic_sdk.core.broadcast import BlockTxBroadcastResult
+from terra_classic_sdk.core import AccAddress
+from terra_classic_sdk.core.auth import TxInfo
+from terra_classic_sdk.core.broadcast import BlockTxBroadcastResult
 
 __all__ = [
     "read_file_as_b64",
diff --git a/terra-classic_sdk/util/converter.py b/terra_classic_sdk/util/converter.py
similarity index 100%
rename from terra-classic_sdk/util/converter.py
rename to terra_classic_sdk/util/converter.py
diff --git a/terra-classic_sdk/util/hash.py b/terra_classic_sdk/util/hash.py
similarity index 100%
rename from terra-classic_sdk/util/hash.py
rename to terra_classic_sdk/util/hash.py
diff --git a/terra-classic_sdk/util/json.py b/terra_classic_sdk/util/json.py
similarity index 96%
rename from terra-classic_sdk/util/json.py
rename to terra_classic_sdk/util/json.py
index 26694cf..c496cad 100644
--- a/terra-classic_sdk/util/json.py
+++ b/terra_classic_sdk/util/json.py
@@ -4,7 +4,7 @@
 from datetime import datetime
 from typing import Any
 
-from terra-classic_sdk.util.converter import to_isoformat
+from terra_classic_sdk.util.converter import to_isoformat
 
 
 def to_data(x: Any) -> Any:
diff --git a/terra-classic_sdk/util/parse_authorization.py b/terra_classic_sdk/util/parse_authorization.py
similarity index 93%
rename from terra-classic_sdk/util/parse_authorization.py
rename to terra_classic_sdk/util/parse_authorization.py
index 4d14b04..4dcd1a0 100644
--- a/terra-classic_sdk/util/parse_authorization.py
+++ b/terra_classic_sdk/util/parse_authorization.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.authz import GenericAuthorization, SendAuthorization, StakeAuthorization
+from terra_classic_sdk.core.authz import GenericAuthorization, SendAuthorization, StakeAuthorization
 from terra_proto.cosmos.authz.v1beta1 import GenericAuthorization as GenericAuthorization_pb
 from terra_proto.cosmos.bank.v1beta1 import SendAuthorization as SendAuthorization_pb
 from terra_proto.cosmos.staking.v1beta1 import StakeAuthorization as StakeAuthorization_pb
diff --git a/terra-classic_sdk/util/parse_content.py b/terra_classic_sdk/util/parse_content.py
similarity index 86%
rename from terra-classic_sdk/util/parse_content.py
rename to terra_classic_sdk/util/parse_content.py
index ff521a3..1cbe3db 100644
--- a/terra-classic_sdk/util/parse_content.py
+++ b/terra_classic_sdk/util/parse_content.py
@@ -1,10 +1,10 @@
 from typing import Union
 
-from terra-classic_sdk.core.distribution.proposals import CommunityPoolSpendProposal
-from terra-classic_sdk.core.gov.proposals import TextProposal
-from terra-classic_sdk.core.params.proposals import ParameterChangeProposal
-from terra-classic_sdk.core.ibc.proposals import ClientUpdateProposal
-from terra-classic_sdk.core.upgrade import (
+from terra_classic_sdk.core.distribution.proposals import CommunityPoolSpendProposal
+from terra_classic_sdk.core.gov.proposals import TextProposal
+from terra_classic_sdk.core.params.proposals import ParameterChangeProposal
+from terra_classic_sdk.core.ibc.proposals import ClientUpdateProposal
+from terra_classic_sdk.core.upgrade import (
     CancelSoftwareUpgradeProposal,
     SoftwareUpgradeProposal,
 )
diff --git a/terra-classic_sdk/util/parse_msg.py b/terra_classic_sdk/util/parse_msg.py
similarity index 84%
rename from terra-classic_sdk/util/parse_msg.py
rename to terra_classic_sdk/util/parse_msg.py
index 9b2e0db..9570967 100644
--- a/terra-classic_sdk/util/parse_msg.py
+++ b/terra_classic_sdk/util/parse_msg.py
@@ -1,20 +1,20 @@
 from .base import create_demux, create_demux_proto, create_demux_unpack_any
 
 # core msgs
-from terra-classic_sdk.core.authz import (
+from terra_classic_sdk.core.authz import (
     MsgExecAuthorized,
     MsgGrantAuthorization,
     MsgRevokeAuthorization,
 )
-from terra-classic_sdk.core.bank import MsgMultiSend, MsgSend
-from terra-classic_sdk.core.distribution import (
+from terra_classic_sdk.core.bank import MsgMultiSend, MsgSend
+from terra_classic_sdk.core.distribution import (
     MsgFundCommunityPool,
     MsgSetWithdrawAddress,
     MsgWithdrawDelegatorReward,
     MsgWithdrawValidatorCommission,
 )
-from terra-classic_sdk.core.gov.msgs import MsgDeposit, MsgSubmitProposal, MsgVote
-from terra-classic_sdk.core.ibc.msgs import (
+from terra_classic_sdk.core.gov.msgs import MsgDeposit, MsgSubmitProposal, MsgVote
+from terra_classic_sdk.core.ibc.msgs import (
     MsgAcknowledgement,
     MsgChannelCloseConfirm,
     MsgChannelCloseInit,
@@ -33,22 +33,22 @@
     MsgUpdateClient,
     MsgUpgradeClient,
 )
-from terra-classic_sdk.core.ibc_transfer import MsgTransfer
-from terra-classic_sdk.core.market import MsgSwap, MsgSwapSend
-from terra-classic_sdk.core.oracle import (
+from terra_classic_sdk.core.ibc_transfer import MsgTransfer
+from terra_classic_sdk.core.market import MsgSwap, MsgSwapSend
+from terra_classic_sdk.core.oracle import (
     MsgAggregateExchangeRatePrevote,
     MsgAggregateExchangeRateVote,
     MsgDelegateFeedConsent,
 )
-from terra-classic_sdk.core.slashing import MsgUnjail
-from terra-classic_sdk.core.staking import (
+from terra_classic_sdk.core.slashing import MsgUnjail
+from terra_classic_sdk.core.staking import (
     MsgBeginRedelegate,
     MsgCreateValidator,
     MsgDelegate,
     MsgEditValidator,
     MsgUndelegate,
 )
-from terra-classic_sdk.core.wasm import (
+from terra_classic_sdk.core.wasm import (
     MsgClearContractAdmin,
     MsgExecuteContract,
     MsgInstantiateContract,
@@ -57,11 +57,11 @@
     MsgStoreCode,
     MsgUpdateContractAdmin,
 )
-from terra-classic_sdk.core.feegrant import (
+from terra_classic_sdk.core.feegrant import (
     MsgGrantAllowance,
     MsgRevokeAllowance
 )
-from terra-classic_sdk.core.crisis import (
+from terra_classic_sdk.core.crisis import (
     MsgVerifyInvariant
 )
 
diff --git a/terra-classic_sdk/util/parse_proto.py b/terra_classic_sdk/util/parse_proto.py
similarity index 100%
rename from terra-classic_sdk/util/parse_proto.py
rename to terra_classic_sdk/util/parse_proto.py
diff --git a/terra-classic_sdk/util/remove_none.py b/terra_classic_sdk/util/remove_none.py
similarity index 100%
rename from terra-classic_sdk/util/remove_none.py
rename to terra_classic_sdk/util/remove_none.py
diff --git a/terra-classic_sdk/util/url.py b/terra_classic_sdk/util/url.py
similarity index 100%
rename from terra-classic_sdk/util/url.py
rename to terra_classic_sdk/util/url.py
diff --git a/tests/client/lcd/api/auth_test.py b/tests/client/lcd/api/auth_test.py
index 6b3aa9c..4a3d36d 100644
--- a/tests/client/lcd/api/auth_test.py
+++ b/tests/client/lcd/api/auth_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/authz_test.py b/tests/client/lcd/api/authz_test.py
index 8b5e1c0..0deb199 100644
--- a/tests/client/lcd/api/authz_test.py
+++ b/tests/client/lcd/api/authz_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/bank_test.py b/tests/client/lcd/api/bank_test.py
index cc2192e..fd80818 100644
--- a/tests/client/lcd/api/bank_test.py
+++ b/tests/client/lcd/api/bank_test.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.params import PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.params import PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/distribution_test.py b/tests/client/lcd/api/distribution_test.py
index 2166c7b..8dbb965 100644
--- a/tests/client/lcd/api/distribution_test.py
+++ b/tests/client/lcd/api/distribution_test.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.core.bech32 import is_acc_address
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.core.bech32 import is_acc_address
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/feegrant_test.py b/tests/client/lcd/api/feegrant_test.py
index 56ecc2e..9485b67 100644
--- a/tests/client/lcd/api/feegrant_test.py
+++ b/tests/client/lcd/api/feegrant_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/gov_test.py b/tests/client/lcd/api/gov_test.py
index db8d7d9..da77b7c 100644
--- a/tests/client/lcd/api/gov_test.py
+++ b/tests/client/lcd/api/gov_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/ibc_test.py b/tests/client/lcd/api/ibc_test.py
index e03bebb..0571e35 100644
--- a/tests/client/lcd/api/ibc_test.py
+++ b/tests/client/lcd/api/ibc_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/ibc_transfer_test.py b/tests/client/lcd/api/ibc_transfer_test.py
index 0e76fd2..4e422d0 100644
--- a/tests/client/lcd/api/ibc_transfer_test.py
+++ b/tests/client/lcd/api/ibc_transfer_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/market_test.py b/tests/client/lcd/api/market_test.py
index e7e19cd..046d72d 100644
--- a/tests/client/lcd/api/market_test.py
+++ b/tests/client/lcd/api/market_test.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.core import Coin
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.core import Coin
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/mint_test.py b/tests/client/lcd/api/mint_test.py
index aa59f4a..24a795e 100644
--- a/tests/client/lcd/api/mint_test.py
+++ b/tests/client/lcd/api/mint_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/oracle_test.py b/tests/client/lcd/api/oracle_test.py
index afb0e0b..2b0a2ec 100644
--- a/tests/client/lcd/api/oracle_test.py
+++ b/tests/client/lcd/api/oracle_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/slashing_test.py b/tests/client/lcd/api/slashing_test.py
index 6a5a40d..06f6dda 100644
--- a/tests/client/lcd/api/slashing_test.py
+++ b/tests/client/lcd/api/slashing_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient, PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient, PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/staking_test.py b/tests/client/lcd/api/staking_test.py
index 52e5cc3..ce1f1b4 100644
--- a/tests/client/lcd/api/staking_test.py
+++ b/tests/client/lcd/api/staking_test.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.params import PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.params import PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/tendermint_test.py b/tests/client/lcd/api/tendermint_test.py
index c6dd63e..e8f087c 100644
--- a/tests/client/lcd/api/tendermint_test.py
+++ b/tests/client/lcd/api/tendermint_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/tx_test.py b/tests/client/lcd/api/tx_test.py
index 6816b4a..2376279 100644
--- a/tests/client/lcd/api/tx_test.py
+++ b/tests/client/lcd/api/tx_test.py
@@ -1,5 +1,5 @@
-from terra-classic_sdk.client.lcd import LCDClient
-from terra-classic_sdk.client.lcd.params import PaginationOptions
+from terra_classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd.params import PaginationOptions
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/api/wasm_test.py b/tests/client/lcd/api/wasm_test.py
index b2357ce..5996997 100644
--- a/tests/client/lcd/api/wasm_test.py
+++ b/tests/client/lcd/api/wasm_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(
     url="https://bombay-lcd.terra.dev/",
diff --git a/tests/client/lcd/lcdclient_test.py b/tests/client/lcd/lcdclient_test.py
index 03a6172..6910de0 100644
--- a/tests/client/lcd/lcdclient_test.py
+++ b/tests/client/lcd/lcdclient_test.py
@@ -1,7 +1,7 @@
 import asynctest
 from aioresponses import aioresponses
 
-from terra-classic_sdk.client.lcd import AsyncLCDClient, LCDClient
+from terra_classic_sdk.client.lcd import AsyncLCDClient, LCDClient
 
 """
 class TestDoSessionGet(asynctest.TestCase):
diff --git a/tests/client/lcd/lcdutils_test.py b/tests/client/lcd/lcdutils_test.py
index 83d16ec..6b30c1c 100644
--- a/tests/client/lcd/lcdutils_test.py
+++ b/tests/client/lcd/lcdutils_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.client.lcd import LCDClient
+from terra_classic_sdk.client.lcd import LCDClient
 
 terra = LCDClient(chain_id="bombay-12", url="https://bombay-lcd.terra.dev")
 
diff --git a/tests/core/auth/data/account_test.py b/tests/core/auth/data/account_test.py
index 0453eaa..6c8ffab 100644
--- a/tests/core/auth/data/account_test.py
+++ b/tests/core/auth/data/account_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.auth import Account, LazyGradedVestingAccount
+from terra_classic_sdk.core.auth import Account, LazyGradedVestingAccount
 
 
 def test_deserializes_account_example(load_json_examples):
diff --git a/tests/core/auth/data/tx_test.py b/tests/core/auth/data/tx_test.py
index 9a2146f..63ad73e 100644
--- a/tests/core/auth/data/tx_test.py
+++ b/tests/core/auth/data/tx_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core import Tx
+from terra_classic_sdk.core import Tx
 
 
 def test_deserializes_tx(load_json_examples):
diff --git a/tests/core/authz/msgs_test.py b/tests/core/authz/msgs_test.py
index 6d6f209..6a022fb 100644
--- a/tests/core/authz/msgs_test.py
+++ b/tests/core/authz/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.authz import (
+from terra_classic_sdk.core.authz import (
     MsgExecAuthorized,
     MsgGrantAuthorization,
     MsgRevokeAuthorization,
diff --git a/tests/core/bank/msgs_test.py b/tests/core/bank/msgs_test.py
index 3e902f3..5f38222 100644
--- a/tests/core/bank/msgs_test.py
+++ b/tests/core/bank/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.bank import MsgMultiSend, MsgSend
+from terra_classic_sdk.core.bank import MsgMultiSend, MsgSend
 
 
 def test_deserializes_msg_send(load_msg_examples):
diff --git a/tests/core/coin_test.py b/tests/core/coin_test.py
index ff5969c..95cf81e 100644
--- a/tests/core/coin_test.py
+++ b/tests/core/coin_test.py
@@ -1,6 +1,6 @@
 import pytest
 
-from terra-classic_sdk.core import Coin, Dec
+from terra_classic_sdk.core import Coin, Dec
 
 
 def test_multiple_amount_types():
diff --git a/tests/core/coins_test.py b/tests/core/coins_test.py
index 2424109..2c0c04c 100644
--- a/tests/core/coins_test.py
+++ b/tests/core/coins_test.py
@@ -1,6 +1,6 @@
 import pytest
 
-from terra-classic_sdk.core import Coin, Coins
+from terra_classic_sdk.core import Coin, Coins
 
 
 def test_clobbers_similar_denom():
diff --git a/tests/core/distribution/msgs_test.py b/tests/core/distribution/msgs_test.py
index d870163..14eaa80 100644
--- a/tests/core/distribution/msgs_test.py
+++ b/tests/core/distribution/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.distribution import (
+from terra_classic_sdk.core.distribution import (
     MsgSetWithdrawAddress,
     MsgWithdrawDelegatorReward,
     MsgWithdrawValidatorCommission,
diff --git a/tests/core/gov/msgs_test.py b/tests/core/gov/msgs_test.py
index d68e52b..e2727c8 100644
--- a/tests/core/gov/msgs_test.py
+++ b/tests/core/gov/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.gov import MsgDeposit, MsgSubmitProposal
+from terra_classic_sdk.core.gov import MsgDeposit, MsgSubmitProposal
 
 
 def test_deserializes_msg_deposit_examples(load_msg_examples):
diff --git a/tests/core/market/msgs_test.py b/tests/core/market/msgs_test.py
index 3b6d54a..e78e3f6 100644
--- a/tests/core/market/msgs_test.py
+++ b/tests/core/market/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.market import MsgSwap, MsgSwapSend
+from terra_classic_sdk.core.market import MsgSwap, MsgSwapSend
 
 
 def test_deserializes_msg_swap_examples(load_msg_examples):
diff --git a/tests/core/numeric_test.py b/tests/core/numeric_test.py
index b141533..bdd853d 100644
--- a/tests/core/numeric_test.py
+++ b/tests/core/numeric_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core import Dec
+from terra_classic_sdk.core import Dec
 from decimal import Decimal
 import pytest
 
diff --git a/tests/core/oracle/msgs_test.py b/tests/core/oracle/msgs_test.py
index b8a4de8..5a8cb98 100644
--- a/tests/core/oracle/msgs_test.py
+++ b/tests/core/oracle/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.oracle import MsgAggregateExchangeRateVote, MsgDelegateFeedConsent
+from terra_classic_sdk.core.oracle import MsgAggregateExchangeRateVote, MsgDelegateFeedConsent
 
 
 def test_deserializes_msg_delegate_feed_consent_examples(load_msg_examples):
diff --git a/tests/core/slashing/msgs_test.py b/tests/core/slashing/msgs_test.py
index 8cb7309..2ed0084 100644
--- a/tests/core/slashing/msgs_test.py
+++ b/tests/core/slashing/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.slashing.msgs import MsgUnjail
+from terra_classic_sdk.core.slashing.msgs import MsgUnjail
 
 
 def test_deserializes_msg_unjail_examples(load_msg_examples):
diff --git a/tests/core/staking/data/delegation_test.py b/tests/core/staking/data/delegation_test.py
index 784e0e1..676de35 100644
--- a/tests/core/staking/data/delegation_test.py
+++ b/tests/core/staking/data/delegation_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.staking import Delegation, Redelegation, UnbondingDelegation
+from terra_classic_sdk.core.staking import Delegation, Redelegation, UnbondingDelegation
 
 
 def test_deserialize_unbonding_delegation_examples(load_json_examples):
diff --git a/tests/core/staking/data/validator_test.py b/tests/core/staking/data/validator_test.py
index fdefef1..50980f3 100644
--- a/tests/core/staking/data/validator_test.py
+++ b/tests/core/staking/data/validator_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.staking import Validator
+from terra_classic_sdk.core.staking import Validator
 
 
 def test_deserializes():
diff --git a/tests/core/staking/msgs_test.py b/tests/core/staking/msgs_test.py
index c81948f..cfcc2c2 100644
--- a/tests/core/staking/msgs_test.py
+++ b/tests/core/staking/msgs_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.staking import MsgBeginRedelegate, MsgDelegate, MsgUndelegate
+from terra_classic_sdk.core.staking import MsgBeginRedelegate, MsgDelegate, MsgUndelegate
 
 
 def test_deserialize_msg_delegate_examples(load_msg_examples):
diff --git a/tests/core/strings_test.py b/tests/core/strings_test.py
index ce6822e..38b7f36 100644
--- a/tests/core/strings_test.py
+++ b/tests/core/strings_test.py
@@ -1,4 +1,4 @@
-from terra-classic_sdk.core.bech32 import (
+from terra_classic_sdk.core.bech32 import (
     is_acc_address,
     is_acc_pubkey,
     is_val_address,
diff --git a/tests/key/mnemonic_test.py b/tests/key/mnemonic_test.py
index 10123ad..cc2d1c2 100644
--- a/tests/key/mnemonic_test.py
+++ b/tests/key/mnemonic_test.py
@@ -1,11 +1,11 @@
 import base64
 
-from terra-classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
-from terra-classic_sdk.client.lcd.lcdclient import LCDClient
-from terra-classic_sdk.core import Coins, SignDoc
-from terra-classic_sdk.core.bank import MsgSend
-from terra-classic_sdk.core.fee import Fee
-from terra-classic_sdk.key.mnemonic import MnemonicKey
+from terra_classic_sdk.client.lcd.api.tx import CreateTxOptions, SignerOptions
+from terra_classic_sdk.client.lcd.lcdclient import LCDClient
+from terra_classic_sdk.core import Coins, SignDoc
+from terra_classic_sdk.core.bank import MsgSend
+from terra_classic_sdk.core.fee import Fee
+from terra_classic_sdk.key.mnemonic import MnemonicKey
 
 
 def test_derivation():