diff --git a/app/models/names_manager/canonical_names.rb b/app/models/names_manager/canonical_names.rb
index e257a159..1364ae50 100644
--- a/app/models/names_manager/canonical_names.rb
+++ b/app/models/names_manager/canonical_names.rb
@@ -273,6 +273,7 @@ def self.map(canonical_name, *also_as)
     map 'Bryan Kang',                 'deepblue'
     map 'Buddhika Laknath',           'laknath', 'Laknath'
     map 'Caio Chassot',               'caio', "k\100v2studio.com"
+    map 'Caleb Buxton',               "Caleb"
     map 'Caleb Tennis',               "caleb\100aei-tech.com"
     map 'Calvin Yu',                  'cyu'
     map 'Carina C. Zona',             'cczona'
diff --git a/test/credits/canonical_names_test.rb b/test/credits/canonical_names_test.rb
index e15fd8a4..aa55b47a 100644
--- a/test/credits/canonical_names_test.rb
+++ b/test/credits/canonical_names_test.rb
@@ -691,6 +691,14 @@ class CanonicalNamesTest < ActiveSupport::TestCase
       assert_contributor_names '4196616', 'David Calavera'
     end
 
+    test 'Caleb' do
+      assert_contributor_names '5fa8793', 'Caleb Buxton', 'Tobias Lütke'
+    end
+
+    test 'Caleb Buxton' do
+      assert_contributor_names 'e68ff5f', 'Caleb Buxton'
+    end
+
     test "caleb\100aei-tech.com" do
       assert_contributor_names 'd5b67ed8', 'Caleb Tennis'
     end