diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/files.properties b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/files.properties
index 27d50aa20ab..fcaf49fd2d0 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/files.properties
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/files.properties
@@ -73,6 +73,7 @@ page.server_jpa_mdm.mdm_expansion=MDM Search Expansion
 
 section.server_jpa_cql.title=JPA Server: CQL
 page.server_jpa_cql.cql=CQL Getting Started
+page.server_jpa_cql.cql_measure=CQL Measure
 
 section.server_jpa_partitioning.title=JPA Server: Partitioning and Multitenancy
 page.server_jpa_partitioning.partitioning=Partitioning and Multitenancy
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/images/ref.measure.architecture.drawio.svg b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/images/ref_measure_architecture_drawio.svg
similarity index 100%
rename from hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/images/ref.measure.architecture.drawio.svg
rename to hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/images/ref_measure_architecture_drawio.svg
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql.md
index a069e590584..e6429927237 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql.md
@@ -29,7 +29,7 @@ There are two Spring beans available that add CQL processing to HAPI. You can en
 
 HAPI provides implementations for some operations in DSTU3 and R4:
 
-[Measure Operations](cql_measure)
+[CQL Measure](cql_measure.html)
 
 ## Roadmap
 
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql_measure.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql_measure.md
index 208b6b3f41a..33b66e17bd5 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql_measure.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_cql/cql_measure.md
@@ -1,4 +1,4 @@
-# Measures
+# CQL Measure
 
 ## Introduction
 
@@ -234,7 +234,7 @@ The HAPI implementation uses the populations defined by the CQF Measures IG for
 
 #### Population Criteria
 
-The logical criteria used for determining each Measure population is defined by the [Measure.group.population.criteria element](). The Measure specification allows population criteria to be defined using FHIR Path, CQL, or other languages as appropriate. The HAPI implementation currently only supports using CQL. The relationship between a Measure Population and CQL is illustrated in the [Population Criteria](https://build.fhir.org/ig/HL7/cqf-measures/measure-conformance.html#population-criteria) section of the CQF Measures IG.
+The logical criteria used for determining each Measure population is defined by the [Measure.group.population.criteria](https://hl7.org/fhir/R4/measure-definitions.html#Measure.group.population.criteria) element. The Measure specification allows population criteria to be defined using FHIR Path, CQL, or other languages as appropriate. The HAPI implementation currently only supports using CQL. The relationship between a Measure Population and CQL is illustrated in the [Population Criteria](https://build.fhir.org/ig/HL7/cqf-measures/measure-conformance.html#population-criteria) section of the CQF Measures IG.
 
 An example Measure resource with a population criteria referencing a CQL identifier looks like:
 
@@ -376,13 +376,13 @@ Below are a few diagrams that show the overall architecture of Measure evaluatio
 
 This is a simplified component diagram of the Measure evaluation architecture
 
-![Measure Evaluation Architecture](images/../../images/ref.measure.architecture.drawio.svg)
+![Measure Evaluation Architecture](/hapi-fhir/docs/images/ref_measure_architecture_drawio.svg)
 
 ### Sequence Chart
 
 This sequence chart approximates the Measure evaluation logic implemented by HAPI.
 
-![Measure Evaluation Sequence Chart](images/../../images/measure_evaluation_sequence.png)
+![Measure Evaluation Sequence Chart](/hapi-fhir/docs/images/measure_evaluation_sequence.png)
 
 ## FAQs
 
@@ -402,5 +402,5 @@ A: Yes, though the Measure and associated Resources must be in the same partitio
 * Support for stratifiers
 * Support for Group subjects
 * Support for FHIRPath expressions in Stratifiers, Supplemental Data Elements, and Population Criteria
-* $data-requirements, $collect-data, $submit-data, and $care-gaps operations
+* `$data-requirements`, `$collect-data`, `$submit-data`, and `$care-gaps` operations
 * Support for more extensions defined in the CQF Measures, CPG, and ATR IGs