diff --git a/Makefile b/Makefile
index 873e818b48..d8bae62728 100644
--- a/Makefile
+++ b/Makefile
@@ -223,7 +223,7 @@ sdist_upload: clean docs
 # TODO: variable-ize major version number usages here
 .PHONY: changelog_reno
 changelog_reno:
-	reno -d changelogs/ report --title 'Ansible 2.5 "Kashmir" Release Notes' --no-collapse-pre-release --no-show-source --earliest-version v2.5.0b1 --output changelogs/CHANGELOG_v2.5.rst
+	reno -d changelogs/ report --title 'Ansible 2.5 "Kashmir" Release Notes' --no-collapse-pre-release --no-show-source --earliest-version v2.5.0b1 --output changelogs/CHANGELOG-v2.5.rst
 
 .PHONY: rpmcommon
 rpmcommon: sdist
diff --git a/changelogs/CHANGELOG_legacy.rst b/changelogs/CHANGELOG-legacy.rst
similarity index 100%
rename from changelogs/CHANGELOG_legacy.rst
rename to changelogs/CHANGELOG-legacy.rst
diff --git a/changelogs/CHANGELOG_v2.0.rst b/changelogs/CHANGELOG-v2.0.rst
similarity index 100%
rename from changelogs/CHANGELOG_v2.0.rst
rename to changelogs/CHANGELOG-v2.0.rst
diff --git a/changelogs/CHANGELOG_v2.1.rst b/changelogs/CHANGELOG-v2.1.rst
similarity index 100%
rename from changelogs/CHANGELOG_v2.1.rst
rename to changelogs/CHANGELOG-v2.1.rst
diff --git a/changelogs/CHANGELOG_v2.2.rst b/changelogs/CHANGELOG-v2.2.rst
similarity index 100%
rename from changelogs/CHANGELOG_v2.2.rst
rename to changelogs/CHANGELOG-v2.2.rst
diff --git a/changelogs/CHANGELOG_v2.3.rst b/changelogs/CHANGELOG-v2.3.rst
similarity index 100%
rename from changelogs/CHANGELOG_v2.3.rst
rename to changelogs/CHANGELOG-v2.3.rst
diff --git a/changelogs/CHANGELOG_v2.4.rst b/changelogs/CHANGELOG-v2.4.rst
similarity index 100%
rename from changelogs/CHANGELOG_v2.4.rst
rename to changelogs/CHANGELOG-v2.4.rst
diff --git a/changelogs/CHANGELOG_v2.5.rst b/changelogs/CHANGELOG-v2.5.rst
similarity index 100%
rename from changelogs/CHANGELOG_v2.5.rst
rename to changelogs/CHANGELOG-v2.5.rst