diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6a1bce67f..370b3d8c56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,27 +14,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [7.16.0] - 2024-03-21
 ### Added
 - [Core] Improved support for multiple classloaders in IncrementingUuidGenerator ([#2853](https://github.com/cucumber/cucumber-jvm/pull/2853) J. Kronegg)
-- [Java] Assume numbers use either a comma or period for the thousands separator instead of non-breaking spaces. ([#290](https://github.com/cucumber/cucumber-expressions/pull/290))
+- [Core] Assume numbers use either a comma or period for the thousands separator instead of non-breaking spaces. ([cucumber-expressions/#290](https://github.com/cucumber/cucumber-expressions/pull/290))
 - [JUnit Platform Engine] Improve the cucumber.features warning ([#2856](https://github.com/cucumber/cucumber-expressions/pull/2856) M.P. Korstanje)
 - [JUnit Platform Engine] Improve Maven and Gradle compatibility ([#2832](https://github.com/cucumber/cucumber-jvm/pull/2832) M.P. Korstanje)
 
 ### Changed
 - [TestNG] Update dependency org.testng:testng to v7.9.0
 - [Core] Update dependency io.cucumber:tag-expressions to v6.1.0
-- [Core] Update Messages and dependants ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
+- [Core] Update Messages and dependants ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826))
 - [Core] Update dependency io.cucumber:gherkin to v27.0.0
-- [Core] Added Malayalam localization ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
-- [Core] Added 'ed' to Italian ([#31](https://github.com/cucumber/gherkin/issues/160))
-- [Core] Added Danish translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
-- [Core] Added Dutch translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
-- [Core] Added Esperanto translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
+- [Core] Added Malayalam localization ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826))
+- [Core] Added 'ed' to Italian ([gherkin/#31](https://github.com/cucumber/gherkin/issues/160))
+- [Core] Added Danish translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826))
+- [Core] Added Dutch translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826))
+- [Core] Added Esperanto translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826))
 - [JUnit Platform Engine] Use JUnit Platform 1.10.2 (JUnit Jupiter 5.10.2)
-- [Core] Added Vietnamese translation of "Rule" ([#204](https://github.com/cucumber/gherkin/pull/204))
-- [Core] Added Irish translation of "Rule" ([#216](https://github.com/cucumber/gherkin/pull/216))
+- [Core] Added Vietnamese translation of "Rule" ([gherkin/#204](https://github.com/cucumber/gherkin/pull/204))
+- [Core] Added Irish translation of "Rule" ([gherkin/#216](https://github.com/cucumber/gherkin/pull/216))
 
 ### Fixed
-- [Core] Missing execution steps statuses ([#24](https://github.com/cucumber/cucumber-junit-xml-formatter/pull/24) F. Ahadi)
-- [Java] Parse negative numbers in Norwegian (and 59 other languages) ([#290](https://github.com/cucumber/cucumber-expressions/pull/290))
+- [Core] Missing execution steps statuses ([cucumber-junit-xml-formatter/#24](https://github.com/cucumber/cucumber-junit-xml-formatter/pull/24) F. Ahadi)
+- [Core] Parse negative numbers in Norwegian (and 59 other languages) ([cucumber-expressions/#290](https://github.com/cucumber/cucumber-expressions/pull/290))
 
 ## [7.15.0] - 2023-12-11
 ### Added