diff --git a/examples/if_stake.py b/examples/if_stake.py
index d332e6a1..d7ea8be6 100644
--- a/examples/if_stake.py
+++ b/examples/if_stake.py
@@ -13,7 +13,7 @@
 from driftpy.constants.config import configs
 from driftpy.drift_client import DriftClient
 from driftpy.accounts import *
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 
 async def view_logs(
     sig: str,
diff --git a/examples/limit_order_grid.py b/examples/limit_order_grid.py
index 5fa0ee09..b98cc244 100644
--- a/examples/limit_order_grid.py
+++ b/examples/limit_order_grid.py
@@ -16,7 +16,7 @@
 from driftpy.math.oracle import get_oracle_data
 from driftpy.math.spot_market import get_signed_token_amount, get_token_amount
 from driftpy.drift_client import DriftClient
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 from driftpy.constants.numeric_constants import BASE_PRECISION, PRICE_PRECISION
 from borsh_construct.enum import _rust_enum
 import time
diff --git a/examples/start_lp.py b/examples/start_lp.py
index 3457f684..5ba02dde 100644
--- a/examples/start_lp.py
+++ b/examples/start_lp.py
@@ -12,7 +12,7 @@
 
 # todo: airdrop udsc + init account for any kp
 # rn do it through UI 
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 from driftpy.constants.numeric_constants import AMM_RESERVE_PRECISION
 from solana.rpc import commitment
 import pprint
diff --git a/examples/view.py b/examples/view.py
index f0351f48..65f12d62 100644
--- a/examples/view.py
+++ b/examples/view.py
@@ -11,7 +11,7 @@
 from driftpy.math.positions import is_available
 from driftpy.constants.numeric_constants import *
 
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 
 async def main(
     authority, 
diff --git a/src/driftpy/drift_user.py b/src/driftpy/drift_user.py
index 95f17d6d..6a427ea6 100644
--- a/src/driftpy/drift_user.py
+++ b/src/driftpy/drift_user.py
@@ -18,7 +18,7 @@ def find(l: list, f):
         return valid_values[0]
 
 
-class User:
+class DriftUser:
     """This class is the main way to retrieve and inspect data on Drift Protocol."""
 
     def __init__(
diff --git a/tests/test.py b/tests/test.py
index 77e5c813..8d9d2ae2 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -14,7 +14,7 @@
 )
 from math import sqrt
 
-from driftpy.drift_user import User as DriftUser
+from driftpy.drift_user import DriftUser as DriftUser
 from driftpy.drift_client import DriftClient
 from driftpy.setup.helpers import (
     _create_mint,