diff --git a/ansible/main.yml b/ansible/main.yml
index b6f13a80..f1b93e47 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -16,7 +16,7 @@
 
 - hosts: os_MacOSX
   roles:
-    - role: osx
+    - role: macos
   tasks:
     - name: install fennel
       command: luarocks install fennel
@@ -26,11 +26,3 @@
     - dotfiles
     - ruby
     - zsh
-
-- hosts: all
-  tasks:
-
-    - name: update git remote for dotfiles
-      command: git remote set-url origin git@github.com:kejadlen/dotfiles.git
-      args:
-        chdir: ~/.dotfiles
diff --git a/ansible/playbooks/mac_os.yml b/ansible/playbooks/mac_os.yml
index 2e1d96df..e3c271b2 100644
--- a/ansible/playbooks/mac_os.yml
+++ b/ansible/playbooks/mac_os.yml
@@ -8,20 +8,20 @@
     - file: path=~/Library/KeyBindings state=directory
     - name: Symlink Emacs-style keybindings for OS X
       file:
-        src: ~/.dotfiles/osx/DefaultKeyBinding.dict
+        src: ~/.dotfiles/macos/DefaultKeyBinding.dict
         dest: ~/Library/KeyBindings/DefaultKeyBinding.dict
         state: link
 
+    - file: path=~/Library/Dictionaries state=directory
     - name: Install Webster's 1913 dictionary
       block:
         - copy:
-            src: ~/.dotfiles/osx/websters-1913.dictionary/
+            src: ~/.dotfiles/macos/websters-1913.dictionary/
             dest: ~/Library/Dictionaries/websters-1913.dictionary
 
         # This worked in earlier versions of MacOS, but not in Big Sur?
         # The plist now looks like this:
         #
-        #
         # ❯ /usr/libexec/PlistBuddy -c "Print" ~/Library/Preferences/com.apple.DictionaryServices.plist
         # Dict {
         #     DCSActiveDictionaries = Array {
diff --git a/ansible/roles/dotfiles/tasks/main.yml b/ansible/roles/dotfiles/tasks/main.yml
index 7cf08678..308e6c17 100644
--- a/ansible/roles/dotfiles/tasks/main.yml
+++ b/ansible/roles/dotfiles/tasks/main.yml
@@ -23,5 +23,5 @@
   file: src=~/.dotfiles/bin dest=~/bin state=link
 
 - name: symlink ~/.tmux.conf.local
-  file: src=~/.dotfiles/osx/.tmux.conf.local dest=~/.tmux.conf.local state=link
+  file: src=~/.dotfiles/macos/.tmux.conf.local dest=~/.tmux.conf.local state=link
   when: ansible_distribution == "MacOSX"
diff --git a/ansible/roles/osx/tasks/dock.yml b/ansible/roles/macos/tasks/dock.yml
similarity index 81%
rename from ansible/roles/osx/tasks/dock.yml
rename to ansible/roles/macos/tasks/dock.yml
index c9c3d8ff..e08e9c43 100644
--- a/ansible/roles/osx/tasks/dock.yml
+++ b/ansible/roles/macos/tasks/dock.yml
@@ -1,13 +1,13 @@
 - name: install dockutil
   homebrew: name=dockutil state=present
 
-- command: /usr/local/bin/dockutil --list
+- command: dockutil --list
   register: dockutil_result
 - name: remove all Dock icons
-  command: /usr/local/bin/dockutil --remove all
+  command: dockutil --remove all
   when: not (dockutil_result.stdout_lines | length == 1 and dockutil_result.stdout is search("^Downloads"))
 - name: add ~/Downloads to the Dock
-  command: /usr/local/bin/dockutil --add ~/Downloads
+  command: dockutil --add ~/Downloads
                                       --view list
                                       --display stack
                                       --sort datemodified
diff --git a/ansible/roles/osx/tasks/main.yml b/ansible/roles/macos/tasks/main.yml
similarity index 84%
rename from ansible/roles/osx/tasks/main.yml
rename to ansible/roles/macos/tasks/main.yml
index 864615f9..003a38df 100644
--- a/ansible/roles/osx/tasks/main.yml
+++ b/ansible/roles/macos/tasks/main.yml
@@ -4,14 +4,14 @@
 - file: path=~/Library/KeyBindings state=directory
 - name: Symlink Emacs-style keybindings for OS X
   file:
-    src: ~/.dotfiles/osx/DefaultKeyBinding.dict
+    src: ~/.dotfiles/macos/DefaultKeyBinding.dict
     dest: ~/Library/KeyBindings/DefaultKeyBinding.dict
     state: link
 
 - file: path=~/Library/Colors state=directory
 - name: symlink OS X colors palettes
   file: src={{ item }} dest=~/Library/Colors/{{ item | basename }} state=link
-  with_fileglob: ~/.dotfiles/osx/Colors/*
+  with_fileglob: ~/.dotfiles/macos/Colors/*
 
 - name: disable gamed
   command: launchctl unload -w /System/Library/LaunchAgents/com.apple.gamed.plist
diff --git a/ansible/roles/osx/tasks/terminal.yml b/ansible/roles/macos/tasks/terminal.yml
similarity index 100%
rename from ansible/roles/osx/tasks/terminal.yml
rename to ansible/roles/macos/tasks/terminal.yml
diff --git a/osx/.tmux.conf.local b/macos/.tmux.conf.local
similarity index 100%
rename from osx/.tmux.conf.local
rename to macos/.tmux.conf.local
diff --git a/osx/Colors/Base16 Default.clr b/macos/Colors/Base16 Default.clr
similarity index 100%
rename from osx/Colors/Base16 Default.clr
rename to macos/Colors/Base16 Default.clr
diff --git a/osx/Colors/Base16 Flat.clr b/macos/Colors/Base16 Flat.clr
similarity index 100%
rename from osx/Colors/Base16 Flat.clr
rename to macos/Colors/Base16 Flat.clr
diff --git a/osx/Colors/Base16 Solarized.clr b/macos/Colors/Base16 Solarized.clr
similarity index 100%
rename from osx/Colors/Base16 Solarized.clr
rename to macos/Colors/Base16 Solarized.clr
diff --git a/osx/DefaultKeyBinding.dict b/macos/DefaultKeyBinding.dict
similarity index 100%
rename from osx/DefaultKeyBinding.dict
rename to macos/DefaultKeyBinding.dict
diff --git a/osx/websters-1913.dictionary/Contents/Info.plist b/macos/websters-1913.dictionary/Contents/Info.plist
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Info.plist
rename to macos/websters-1913.dictionary/Contents/Info.plist
diff --git a/osx/websters-1913.dictionary/Contents/Resources/Body.data b/macos/websters-1913.dictionary/Contents/Resources/Body.data
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/Body.data
rename to macos/websters-1913.dictionary/Contents/Resources/Body.data
diff --git a/osx/websters-1913.dictionary/Contents/Resources/DefaultStyle.css b/macos/websters-1913.dictionary/Contents/Resources/DefaultStyle.css
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/DefaultStyle.css
rename to macos/websters-1913.dictionary/Contents/Resources/DefaultStyle.css
diff --git a/osx/websters-1913.dictionary/Contents/Resources/EntryID.data b/macos/websters-1913.dictionary/Contents/Resources/EntryID.data
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/EntryID.data
rename to macos/websters-1913.dictionary/Contents/Resources/EntryID.data
diff --git a/osx/websters-1913.dictionary/Contents/Resources/EntryID.index b/macos/websters-1913.dictionary/Contents/Resources/EntryID.index
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/EntryID.index
rename to macos/websters-1913.dictionary/Contents/Resources/EntryID.index
diff --git a/osx/websters-1913.dictionary/Contents/Resources/GenBasB.ttf b/macos/websters-1913.dictionary/Contents/Resources/GenBasB.ttf
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/GenBasB.ttf
rename to macos/websters-1913.dictionary/Contents/Resources/GenBasB.ttf
diff --git a/osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-I-smcp.woff b/macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-I-smcp.woff
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-I-smcp.woff
rename to macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-I-smcp.woff
diff --git a/osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-I.ttf b/macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-I.ttf
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-I.ttf
rename to macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-I.ttf
diff --git a/osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-R-smcp.woff b/macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-R-smcp.woff
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-R-smcp.woff
rename to macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-R-smcp.woff
diff --git a/osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-R.ttf b/macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-R.ttf
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/GentiumPlus-R.ttf
rename to macos/websters-1913.dictionary/Contents/Resources/GentiumPlus-R.ttf
diff --git a/osx/websters-1913.dictionary/Contents/Resources/KeyText.data b/macos/websters-1913.dictionary/Contents/Resources/KeyText.data
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/KeyText.data
rename to macos/websters-1913.dictionary/Contents/Resources/KeyText.data
diff --git a/osx/websters-1913.dictionary/Contents/Resources/KeyText.index b/macos/websters-1913.dictionary/Contents/Resources/KeyText.index
similarity index 100%
rename from osx/websters-1913.dictionary/Contents/Resources/KeyText.index
rename to macos/websters-1913.dictionary/Contents/Resources/KeyText.index