diff --git a/examples/healthcare/README.md b/examples/healthcare/README.md
index 0e89c9c663..a3f9a00414 100644
--- a/examples/healthcare/README.md
+++ b/examples/healthcare/README.md
@@ -37,7 +37,7 @@ The sample data is located in the input/ folder.
 
 
 # Entities
-Entities represent the data you are modeling. For this example we provide the **patientrecords** entity. Inside this entity definition you will find all of the example flows.
+Entities represent the data you are modeling. For this example we provide the **Patients** entity. Inside this entity definition you will find all of the example flows.
 
 # Flows
 Flows are sets of plugins that work together to create an envelope document.
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/REST/services/metadata/providers.xml b/examples/healthcare/plugins/entities/Patients/conformance/REST/services/metadata/providers.xml
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/conformance/REST/services/metadata/providers.xml
rename to examples/healthcare/plugins/entities/Patients/conformance/REST/services/metadata/providers.xml
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/REST/services/providers.xqy b/examples/healthcare/plugins/entities/Patients/conformance/REST/services/providers.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/conformance/REST/services/providers.xqy
rename to examples/healthcare/plugins/entities/Patients/conformance/REST/services/providers.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/final/collector/collector.xqy b/examples/healthcare/plugins/entities/Patients/conformance/final/collector/collector.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/conformance/final/collector/collector.xqy
rename to examples/healthcare/plugins/entities/Patients/conformance/final/collector/collector.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/final/content/content.xqy b/examples/healthcare/plugins/entities/Patients/conformance/final/content/content.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/conformance/final/content/content.xqy
rename to examples/healthcare/plugins/entities/Patients/conformance/final/content/content.xqy
diff --git a/examples/healthcare/plugins/entities/Patients/conformance/final/final.xml b/examples/healthcare/plugins/entities/Patients/conformance/final/final.xml
new file mode 100644
index 0000000000..e3044c8524
--- /dev/null
+++ b/examples/healthcare/plugins/entities/Patients/conformance/final/final.xml
@@ -0,0 +1 @@
+<?xml version="1.0" ?><flow xmlns="http://marklogic.com/hub-in-a-box"><name>final</name><entity>Patients</entity><type>conformance</type><complexity>simple</complexity><data-format>application/xml</data-format><plugins></plugins></flow>
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/final/headers/headers.xqy b/examples/healthcare/plugins/entities/Patients/conformance/final/headers/headers.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/conformance/final/headers/headers.xqy
rename to examples/healthcare/plugins/entities/Patients/conformance/final/headers/headers.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/final/triples/triples.xqy b/examples/healthcare/plugins/entities/Patients/conformance/final/triples/triples.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/conformance/final/triples/triples.xqy
rename to examples/healthcare/plugins/entities/Patients/conformance/final/triples/triples.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/hl7/content/content.xqy b/examples/healthcare/plugins/entities/Patients/input/hl7/content/content.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/hl7/content/content.xqy
rename to examples/healthcare/plugins/entities/Patients/input/hl7/content/content.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/hl7/headers/headers.xqy b/examples/healthcare/plugins/entities/Patients/input/hl7/headers/headers.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/hl7/headers/headers.xqy
rename to examples/healthcare/plugins/entities/Patients/input/hl7/headers/headers.xqy
diff --git a/examples/healthcare/plugins/entities/Patients/input/hl7/hl7.xml b/examples/healthcare/plugins/entities/Patients/input/hl7/hl7.xml
new file mode 100644
index 0000000000..a0fcb309eb
--- /dev/null
+++ b/examples/healthcare/plugins/entities/Patients/input/hl7/hl7.xml
@@ -0,0 +1 @@
+<?xml version="1.0" ?><flow xmlns="http://marklogic.com/hub-in-a-box"><name>hl7</name><entity>Patients</entity><type>input</type><complexity>simple</complexity><data-format>application/xml</data-format><plugins></plugins></flow>
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/hl7/triples/triples.xqy b/examples/healthcare/plugins/entities/Patients/input/hl7/triples/triples.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/hl7/triples/triples.xqy
rename to examples/healthcare/plugins/entities/Patients/input/hl7/triples/triples.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/nppes/content/content.xqy b/examples/healthcare/plugins/entities/Patients/input/nppes/content/content.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/nppes/content/content.xqy
rename to examples/healthcare/plugins/entities/Patients/input/nppes/content/content.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/nppes/headers/headers.xqy b/examples/healthcare/plugins/entities/Patients/input/nppes/headers/headers.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/nppes/headers/headers.xqy
rename to examples/healthcare/plugins/entities/Patients/input/nppes/headers/headers.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/nppes/nppes.xml b/examples/healthcare/plugins/entities/Patients/input/nppes/nppes.xml
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/nppes/nppes.xml
rename to examples/healthcare/plugins/entities/Patients/input/nppes/nppes.xml
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/nppes/triples/triples.xqy b/examples/healthcare/plugins/entities/Patients/input/nppes/triples/triples.xqy
similarity index 100%
rename from examples/healthcare/plugins/entities/patientrecords/input/nppes/triples/triples.xqy
rename to examples/healthcare/plugins/entities/Patients/input/nppes/triples/triples.xqy
diff --git a/examples/healthcare/plugins/entities/patientrecords/conformance/final/final.xml b/examples/healthcare/plugins/entities/patientrecords/conformance/final/final.xml
deleted file mode 100644
index be429529d1..0000000000
--- a/examples/healthcare/plugins/entities/patientrecords/conformance/final/final.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><flow xmlns="http://marklogic.com/hub-in-a-box"><name>final</name><entity>patientrecords</entity><type>conformance</type><complexity>simple</complexity><data-format>application/xml</data-format><plugins></plugins></flow>
diff --git a/examples/healthcare/plugins/entities/patientrecords/input/hl7/hl7.xml b/examples/healthcare/plugins/entities/patientrecords/input/hl7/hl7.xml
deleted file mode 100644
index 855b1233e2..0000000000
--- a/examples/healthcare/plugins/entities/patientrecords/input/hl7/hl7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><flow xmlns="http://marklogic.com/hub-in-a-box"><name>hl7</name><entity>patientrecords</entity><type>input</type><complexity>simple</complexity><data-format>application/xml</data-format><plugins></plugins></flow>