diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 67a51c50..a6f9434c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -77,7 +77,7 @@ appveyor.yml                         @jekyll/stability
 
 # Special cases
 .github/                             @jekyll/affinity-team-captains
-CONDUCT.markdown                     @jekyll/affinity-team-captains
+CODE_OF_CONDUCT.markdown             @jekyll/affinity-team-captains
 History.markdown                     @jekyll/affinity-team-captains
 LICENSE                              @jekyll/affinity-team-captains   # This file should never change.
 README.markdown                      @jekyll/affinity-team-captains
diff --git a/CONDUCT.markdown b/CODE_OF_CONDUCT.markdown
similarity index 100%
rename from CONDUCT.markdown
rename to CODE_OF_CONDUCT.markdown
diff --git a/README.markdown b/README.markdown
index b38ed6fa..1350d019 100644
--- a/README.markdown
+++ b/README.markdown
@@ -39,7 +39,7 @@ See: https://jekyllrb.com/docs/troubleshooting/
 ## Code of Conduct
 
 In order to have a more open and welcoming community, Jekyll adheres to a
-[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
+[code of conduct](CODE_OF_CONDUCT.markdown) adapted from the Ruby on Rails code of
 conduct.
 
 Please adhere to this code of conduct in any interactions you have in the
diff --git a/rake/site.rake b/rake/site.rake
index 94aa969e..15680b15 100644
--- a/rake/site.rake
+++ b/rake/site.rake
@@ -69,7 +69,7 @@ namespace :site do
       "redirect_from" => "/conduct/index.html",
       "editable"      => false,
     }
-    siteify_file("CONDUCT.markdown", front_matter)
+    siteify_file("CODE_OF_CONDUCT.markdown", front_matter)
   end
 
   desc "Copy the contributing file"