diff --git a/CHANGES b/CHANGES
index fe6cdbb..571cacb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,12 @@
 - Add support for sequences of geometries and coordinate pairs to read_points
   (#212).
 
+Deprecations:
+
+- 'account' keyword argument of `Uploader` class's `list()`, `delete()`,
+  and `status()` methods will be removed at 1.0. It is replaced by the
+  'username' keyword argument.
+
 0.14.0 (2017-07-10)
 -------------------
 - Permit images of size 1 and 1280 (#196)
diff --git a/mapbox/services/uploads.py b/mapbox/services/uploads.py
index fb6726c..2b7353e 100644
--- a/mapbox/services/uploads.py
+++ b/mapbox/services/uploads.py
@@ -1,7 +1,8 @@
+"""Mapbox Uploads API
 """
-Mapbox Uploads API
-"""
+
 import re
+import warnings
 
 from boto3.session import Session as boto3_session
 from uritemplate import URITemplate
@@ -64,6 +65,15 @@ class Uploader(Service):
 
         return tileset
 
+    # TODO: remove this method at 1.0.
+    def _resolve_username(self, account, username):
+        """Resolve username and handle deprecation of account kwarg"""
+        if account is not None:
+            warnings.warn(
+                "Use keyword argument 'username' instead of 'account'",
+                DeprecationWarning)
+        return username or account or self.username
+
     def stage(self, fileobj, creds=None, callback=None):
         """Stages data in a Mapbox-owned S3 bucket
 
@@ -140,7 +150,7 @@ class Uploader(Service):
         requests.Response
         """
         tileset = self._validate_tileset(tileset)
-        account, _name = tileset.split(".")
+        username, _name = tileset.split(".")
 
         msg = {'tileset': tileset,
                'url': stage_url}
@@ -150,15 +160,15 @@ class Uploader(Service):
 
         msg['name'] = name if name else _name
 
-        uri = URITemplate(self.baseuri + '/{account}').expand(
-            account=account)
+        uri = URITemplate(self.baseuri + '/{username}').expand(
+            username=username)
 
         resp = self.session.post(uri, json=msg)
         self.handle_http_error(resp)
 
         return resp
 
-    def list(self, account=None):
+    def list(self, account=None, username=None):
         """List of all uploads
 
         Returns a Response object, the json() method of which returns
@@ -166,81 +176,74 @@ class Uploader(Service):
 
         Parameters
         ----------
-        account: str
-            Account name, defaults to the service's username.
+        username : str
+            Account username, defaults to the service's username.
+        account : str, **deprecated**
+            Alias for username. Will be removed in version 1.0.
 
         Returns
         -------
         requests.Response
         """
-
-        if account is None:
-            account = self.username
-        uri = URITemplate(self.baseuri + '/{account}').expand(
-            account=account)
+        username = self._resolve_username(account, username)
+        uri = URITemplate(self.baseuri + '/{username}').expand(
+            username=username)
         resp = self.session.get(uri)
         self.handle_http_error(resp)
-
         return resp
 
-    def delete(self, upload, account=None):
+    def delete(self, upload, account=None, username=None):
         """Delete the specified upload
 
         Parameters
         ----------
         upload: str
             The id of the upload or a dict with key 'id'.
-        account: str
-            Account name, defaults to the service's username.
+        username : str
+            Account username, defaults to the service's username.
+        account : str, **deprecated**
+            Alias for username. Will be removed in version 1.0.
 
         Returns
         -------
         requests.Response
         """
-
-        if account is None:
-            account = self.username
-
+        username = self._resolve_username(account, username)
         if isinstance(upload, dict):
             upload_id = upload['id']
         else:
             upload_id = upload
-
-        uri = URITemplate(self.baseuri + '/{account}/{upload_id}').expand(
-            account=account, upload_id=upload_id)
+        uri = URITemplate(self.baseuri + '/{username}/{upload_id}').expand(
+            username=username, upload_id=upload_id)
         resp = self.session.delete(uri)
         self.handle_http_error(resp)
-
         return resp
 
-    def status(self, upload, account=None):
+    def status(self, upload, account=None, username=None):
         """Check status of upload
 
         Parameters
         ----------
         upload: str
             The id of the upload or a dict with key 'id'.
-        account: str
-            Account name, defaults to the service's username.
+        username : str
+            Account username, defaults to the service's username.
+        account : str, **deprecated**
+            Alias for username. Will be removed in version 1.0.
 
         Returns
         -------
         requests.Response
         """
-
-        if account is None:
-            account = self.username
-
+        username = self._resolve_username(account, username)
         if isinstance(upload, dict):
             upload_id = upload['id']
         else:
             upload_id = upload
-
-        uri = URITemplate(self.baseuri + '/{account}/{upload_id}').expand(
-            account=account, upload_id=upload_id)
+        uri = URITemplate(self.baseuri + '/{username}/{upload_id}').expand(
+            username=username, upload_id=upload_id)
         resp = self.session.get(uri)
         self.handle_http_error(resp)
-
         return resp
 
     def upload(self, fileobj, tileset, name=None, patch=False, callback=None):

Uploads API parameters should be username, not account
For consistency with the HTTP api documentation. I'd like to keep the `account` kwarg as a deprecated alias until 1.0.
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 4bb31d9..b802c38 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -32,6 +32,14 @@ def test_class_attrs():
     assert serv.api_version == 'v1'
 
 
+# TODO: remove at 1.0.
+def test_resolve_username():
+    """Username is resolved and deprecation warning raised"""
+    serv = mapbox.Uploader()
+    with pytest.warns(DeprecationWarning):
+        assert serv._resolve_username('foo', 'bar') == 'bar'
+
+
 @responses.activate
 def test_get_credentials():
     query_body = """

pip install -e .[test]
parse_log_pytest
requirements.txt
pytest pytest-cov responses flake8
apt-get update apt-get install -y gcc
3.6
requirements/base.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
attrs==22.2.0
boto3==1.23.10
botocore==1.26.10
CacheControl==0.12.14
certifi==2021.5.30
charset-normalizer==2.0.12
click==8.0.4
click-plugins==1.1.1
cligj==0.7.2
coverage==6.2
coveralls==3.3.1
distlib==0.3.9
docopt==0.6.2
filelock==3.4.1
flake8==5.0.4
idna==3.10
importlib-metadata==4.8.3
importlib-resources==5.4.0
iniconfig==1.1.1
iso3166==2.1.1
jmespath==0.10.0
-e git+https://github.com/mapbox/mapbox-sdk-py.git@d29f0c4bf475f3a126b61e89bcd1336fec5a7675#egg=mapbox
mccabe==0.7.0
msgpack==1.0.5
packaging==21.3
platformdirs==2.4.0
pluggy==1.0.0
polyline==1.4.0
py==1.11.0
pycodestyle==2.9.1
pyflakes==2.5.0
pyparsing==3.1.4
pytest==7.0.1
pytest-cov==4.0.0
python-dateutil==2.9.0.post0
requests==2.27.1
responses==0.17.0
s3transfer==0.5.2
six==1.17.0
toml==0.10.2
tomli==1.2.3
tox==3.28.0
typing_extensions==4.1.1
uritemplate==4.1.1
urllib3==1.26.20
virtualenv==20.17.1
zipp==3.6.0

name: mapbox-sdk-py
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=21.2.2=py36h06a4308_0
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - attrs==22.2.0
      - boto3==1.23.10
      - botocore==1.26.10
      - cachecontrol==0.12.14
      - charset-normalizer==2.0.12
      - click==8.0.4
      - click-plugins==1.1.1
      - cligj==0.7.2
      - coverage==6.2
      - coveralls==3.3.1
      - distlib==0.3.9
      - docopt==0.6.2
      - filelock==3.4.1
      - flake8==5.0.4
      - idna==3.10
      - importlib-metadata==4.8.3
      - importlib-resources==5.4.0
      - iniconfig==1.1.1
      - iso3166==2.1.1
      - jmespath==0.10.0
      - mccabe==0.7.0
      - msgpack==1.0.5
      - packaging==21.3
      - platformdirs==2.4.0
      - pluggy==1.0.0
      - polyline==1.4.0
      - py==1.11.0
      - pycodestyle==2.9.1
      - pyflakes==2.5.0
      - pyparsing==3.1.4
      - pytest==7.0.1
      - pytest-cov==4.0.0
      - python-dateutil==2.9.0.post0
      - requests==2.27.1
      - responses==0.17.0
      - s3transfer==0.5.2
      - six==1.17.0
      - toml==0.10.2
      - tomli==1.2.3
      - tox==3.28.0
      - typing-extensions==4.1.1
      - uritemplate==4.1.1
      - urllib3==1.26.20
      - virtualenv==20.17.1
      - zipp==3.6.0
prefix: /opt/conda/envs/mapbox-sdk-py

tests/test_upload.py::test_resolve_username
tests/test_upload.py::test_class_attrs tests/test_upload.py::test_get_credentials tests/test_upload.py::test_create tests/test_upload.py::test_create_name tests/test_upload.py::test_list tests/test_upload.py::test_status tests/test_upload.py::test_delete tests/test_upload.py::test_stage tests/test_upload.py::test_stage_filename tests/test_upload.py::test_big_stage tests/test_upload.py::test_upload tests/test_upload.py::test_upload_error tests/test_upload.py::test_upload_patch tests/test_upload.py::test_upload_tileset_validation tests/test_upload.py::test_upload_tileset_validation_specialchar tests/test_upload.py::test_upload_tileset_validation_username tests/test_upload.py::test_create_tileset_validation
CHANGES mapbox/services/uploads.py
CHANGES mapbox/services/uploads.py