diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0248474b5..8ffb0a93a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -79,7 +79,7 @@ jobs:
           - run: python3 logo/make.py
           - run: python3 setup.py build --debug --verbose
           - run: python3 test.py
-          - run: python3 setup.py osx-bundle
+          - run: python3 setup.py macos-bundle
 
 
 workflows:
diff --git a/build-terminfo b/build-terminfo
index 054aa4bb6..21ee74935 100755
--- a/build-terminfo
+++ b/build-terminfo
@@ -16,7 +16,7 @@ with open('terminfo/kitty.terminfo', 'w') as f:
 
 os.environ['TERMINFO'] = os.path.join(base, 'terminfo')
 subprocess.check_call(['tic', '-x', 'terminfo/kitty.terminfo'])
-# On OS X tic puts the compiled database into a different directory
+# On macOS tic puts the compiled database into a different directory
 try:
     os.mkdir('terminfo/78')
 except FileExistsError:
diff --git a/kitty/main.py b/kitty/main.py
index d4c505d42..4fc3501a6 100644
--- a/kitty/main.py
+++ b/kitty/main.py
@@ -152,7 +152,7 @@ run_app.first_window_callback = lambda window_handle: None
 run_app.initial_window_size_func = initial_window_size_func
 
 
-def ensure_osx_locale():
+def ensure_macos_locale():
     # Ensure the LANG env var is set. See
     # https://github.com/kovidgoyal/kitty/issues/90
     from .fast_data_types import cocoa_get_lang
@@ -214,7 +214,7 @@ def _main():
     except AttributeError:
         pass  # python compiled without threading
     if is_macos:
-        ensure_osx_locale()
+        ensure_macos_locale()
     try:
         locale.setlocale(locale.LC_ALL, '')
     except Exception:
diff --git a/setup.py b/setup.py
index d9443b992..913aa9850 100755
--- a/setup.py
+++ b/setup.py
@@ -768,7 +768,7 @@ def option_parser():  # {{{
         'action',
         nargs='?',
         default='build',
-        choices='build test linux-package kitty.app osx-bundle clean'.split(),
+        choices='build test linux-package kitty.app macos-bundle osx-bundle clean'.split(),
         help='Action to perform (default is build)'
     )
     p.add_argument(
@@ -849,7 +849,7 @@ def main():
         if not os.path.exists(os.path.join(base, 'docs/_build/html')):
             run_tool(['make', 'docs'])
         package(args)
-    elif args.action == 'osx-bundle':
+    elif args.action in ('macos-bundle', 'osx-bundle'):
         build(args, native_optimizations=False)
         package(args, for_bundle=True)
     elif args.action == 'kitty.app':