diff --git a/.cursor/rules/ascii-source.mdc b/.cursor/rules/ascii-source.mdc
new file mode 100644
index 0000000..aeaf42f
--- /dev/null
+++ b/.cursor/rules/ascii-source.mdc
@@ -0,0 +1,22 @@
+---
+description: Tracked source and docs must be ASCII only
+alwaysApply: true
+---
+
+# ASCII source
+
+Every file you **add or edit** must be **ASCII only** (bytes 0x00-0x7F). Scan touched paths before finishing.
+
+Replace:
+
+| Non-ASCII          | ASCII       |
+| ------------------ | ----------- |
+| em/en dash, minus  | `-`         |
+| ellipsis           | `...`       |
+| curly quotes       | `'` / `"`   |
+| arrows             | `->` / `<-` |
+| non-breaking space | space       |
+
+Do not introduce Unicode symbols, emoji, or locale punctuation in code, comments, XML, or docs.
+
+WSDL/XSD under **`src/main/resources/wsdl/`** or **`src/main/java/wsdls/`** may contain non-ASCII from ADHA sources. Do not add more. Prefer ASCII in files you author.
diff --git a/.cursor/rules/documentation-standards.mdc b/.cursor/rules/documentation-standards.mdc
index 178274b..c7193c7 100644
--- a/.cursor/rules/documentation-standards.mdc
+++ b/.cursor/rules/documentation-standards.mdc
@@ -1,5 +1,5 @@
 ---
-description: Documentation and build scripts — implementor-first, Maven Central default, no secrets
+description: Documentation and build scripts - implementor-first, Maven Central default, no secrets
 alwaysApply: true
 ---
 
@@ -10,13 +10,13 @@ Applies when writing or editing **README**, **CONTRIBUTING**, integrator guides,
 ## Priority: implementors
 
 - Primary audience: developers **consuming** published Maven artifacts.
-- Contributor/maintainer workflow lives in **CONTRIBUTING.md**, **MAINTAINERS.md**, or labelled subsections — not mixed into the integrator main flow.
-- Do not duplicate agent workflow in README or CONTRIBUTING (**AGENTS.md** → `.cursor/rules/`).
+- Contributor/maintainer workflow lives in **CONTRIBUTING.md**, **MAINTAINERS.md**, or labelled subsections - not mixed into the integrator main flow.
+- Do not duplicate agent workflow in README or CONTRIBUTING (**AGENTS.md** -> `.cursor/rules/`).
 
 ## Default narrative: Maven Central
 
-- Write as if **released** coordinates are on Maven Central (no SNAPSHOT, sibling-repo checkout, or `-P…` profiles in the main integrator path).
-- Use **version numbers** in integrator docs — not Git branch names.
+- Write as if **released** coordinates are on Maven Central (no SNAPSHOT, sibling-repo checkout, or `-P...` profiles in the main integrator path).
+- Use **version numbers** in integrator docs - not Git branch names.
 - SNAPSHOT installs and sibling `mvn install` belong under **Local development** / **Local builds** only.
 
 ## Structure
@@ -30,8 +30,8 @@ Applies when writing or editing **README**, **CONTRIBUTING**, integrator guides,
 ## Paths
 
 - **Relative paths only** (e.g. `src/main/resources/wsdl/`, `pom.xml` beside repo root).
-- **Never** hardcode machine paths (`C:\…`, `/Users/…`, `~/`, worktree folders) in tracked docs.
-- Override only when strictly required to remove ambiguity — say why.
+- **Never** hardcode machine paths (`C:\...`, `/Users/...`, `~/`, worktree folders) in tracked docs.
+- Override only when strictly required to remove ambiguity - say why.
 
 ## Current state only
 
@@ -39,12 +39,16 @@ Applies when writing or editing **README**, **CONTRIBUTING**, integrator guides,
 - Describe **what is true now**; omit "removed", "used to", and repo archaeology in integrator material.
 - **CHANGELOG** entries: current release capabilities; avoid branch names and migration essays in new notes.
 
-## Secrets — MUST NOT
+## Secrets - MUST NOT
 
 - **Never** put real or plausible **passwords**, **tokens**, **API keys**, **private keys**, or **keystore passphrases** in tracked files (code, comments, examples, docs).
 - Use placeholders (`<pkcs12-password>`), empty values in `.example` files, or "from your registration pack".
 - See **SECURITY.md**.
 
+## ASCII source
+
+All tracked files you add or change must be **ASCII only**. See **`ascii-source.mdc`**.
+
 ## Override
 
 These rules may be overridden **only when necessary** to clear ambiguity (e.g. maintainer branch mapping in **MAINTAINERS.md** or `.cursor/rules/`, clearly labelled maintainer-only).
diff --git a/.cursor/rules/mhr-wsdl-project.mdc b/.cursor/rules/mhr-wsdl-project.mdc
new file mode 100644
index 0000000..4131808
--- /dev/null
+++ b/.cursor/rules/mhr-wsdl-project.mdc
@@ -0,0 +1,60 @@
+---
+description: MHR WSDL artifact repo layout, release lines, and build
+alwaysApply: true
+---
+
+# mhr-wsdl-java
+
+Maven artifact **`au.gov.nehta:mhr-wsdl`** - MHR B2B WSDL resources and pre-generated JAX-WS/JAXB types. **Not** facade clients (**mhr-b2b-client-java**). **Not** Healthcare Identifiers (**hi-wsdl-java** / **hi-b2b-client-java**).
+
+## Documentation
+
+Follow **`documentation-standards.mdc`**. Integrator docs use **version numbers** - not Git branch names.
+
+The **first number** of **`au.gov.nehta:mhr-wsdl`** is the **Java SE** target. Downstream artifacts that pin this coordinate to **`${project.version}`** (including **`mhr-b2b-client`**) use the same version.
+
+| Version      | Java | XML stack                                            | `Service` stubs  |
+| ------------ | ---- | ---------------------------------------------------- | ---------------- |
+| **8.0.0**  | 8    | **javax** / EE4J **`jaxws-rt` 2.3.x** in consumers   | **12** (MHR B2B) |
+| **11.0.0.1** | 11   | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** in consumers | **12** (MHR B2B) |
+| **17.0.0.1** | 17   | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** in consumers | **12** (MHR B2B) |
+| **21.0.0.1** | 21   | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** in consumers | **12** (MHR B2B) |
+| **24.0.0.1** | 24   | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** in consumers | **12** (MHR B2B) |
+
+**Git branch mapping (maintainers only - never in integrator docs):**
+
+| Version      | Official Git branch |
+| ------------ | ------------------- |
+| **8.0.0**  | `java-8`            |
+| **11.0.0.1** | `java-11`           |
+| **17.0.0.1** | `java-17`           |
+| **21.0.0.1** | `java-21`           |
+| **24.0.0.1** | `java-24`           |
+
+## This 8.0.0 line
+
+**`8.0.0-SNAPSHOT`**: Java **8**, **`javax`** committed types, **12** MHR B2B **`@WebServiceClient`** services. WSDL under **`src/main/resources/wsdl/`** and reference tree **`src/main/java/wsdls/`**. **`mhr_override/`** xmldsig package. Sources frozen - no **`wsimport`** in this POM.
+
+## Build
+
+- JDK **8+**, from repo root: `mvn -B "-Dgpg.skip=true" clean verify` (quote `-D` on PowerShell).
+- Default build uses **committed** `src/main/java` - no wsimport.
+- After wsimport regeneration: **`python scripts/fix-javadoc.py`** then **`mvn verify`** (**`doclint=all`**, **`failOnWarnings=true`**).
+- Consumers add Eclipse EE4J **`com.sun.xml.ws:jaxws-rt` 2.3.7** at runtime - **not** Metro **`webservices-*`**.
+
+## vs mhr-b2b-client-java
+
+|          | **mhr-wsdl-java**                   | **mhr-b2b-client-java**      |
+| -------- | ----------------------------------- | ---------------------------- |
+| Delivers | WSDL on classpath + generated types | Facade clients, TLS, signing |
+| Artifact | `mhr-wsdl`                          | `mhr-b2b-client`             |
+
+Publish **`mhr-wsdl`** first. Consumers that pin **`${project.version}`** (including **`mhr-b2b-client`**) use the same coordinate on each line (**8.0.0**, **11.0.0.1**, and so on).
+
+## Doc split
+
+- **`documentation-standards.mdc`**: implementor-first, Maven Central default, local/OS sections, relative paths, no secrets
+- **`ascii-source.mdc`**: ASCII only in authored files
+- **`README.md`**: integrators (Maven Central default)
+- **`CONTRIBUTING.md`**: build from source, local SNAPSHOT, regeneration notes
+- **`MAINTAINERS.md`**: POM / Javadoc / release internals
diff --git a/.cursor/rules/multi-branch-worktrees.mdc b/.cursor/rules/multi-branch-worktrees.mdc
index 8671bc9..aa0018b 100644
--- a/.cursor/rules/multi-branch-worktrees.mdc
+++ b/.cursor/rules/multi-branch-worktrees.mdc
@@ -3,13 +3,13 @@ description: Use git worktree when editing multiple branches of the same reposit
 alwaysApply: true
 ---
 
-# Multi-branch work — use git worktree
+# Multi-branch work - use git worktree
 
-When a task requires **changes on two or more branches of the same Git repository**, use **`git worktree`** — do **not** hop branches with `git checkout` while carrying uncommitted edits or stashes.
+When a task requires **changes on two or more branches of the same Git repository**, use **`git worktree`** - do **not** hop branches with `git checkout` while carrying uncommitted edits or stashes.
 
 ## When this applies
 
-- Same-repo edits across release lines (e.g. `java-8-javax`, `java-11-jakarta`, `master`)
+- Same-repo edits across release lines (e.g. `java-8`, `java-11`)
 - Applying the same fix to several branches before commit
 - Comparing or building two branches side by side
 
@@ -22,7 +22,7 @@ When a task requires **changes on two or more branches of the same Git repositor
 ## Workflow
 
 1. **Primary clone** stays on the main working branch; do not stash-and-hop to edit other branches.
-2. **Add a worktree per extra branch** (paths are local — never commit them to tracked docs):
+2. **Add a worktree per extra branch** (paths are local - never commit them to tracked docs):
 
    ```bash
    git worktree add ../<repo>-<branch-slug> <branch>
@@ -34,18 +34,12 @@ When a task requires **changes on two or more branches of the same Git repositor
 ## Do not
 
 - `git checkout` other branches with uncommitted changes (Git will block or force stash churn).
-- Stash the same files across multiple branch switches — causes merge conflicts on `stash pop`.
+- Stash the same files across multiple branch switches - causes merge conflicts on `stash pop`.
 - Put worktree directory paths in README, CONTRIBUTING, or other tracked docs (see repo **`worktrees.mdc`** / **`documentation-standards.mdc`**).
 
 ## Example (maintainer-local paths only)
 
 ```bash
-# In hi-wsdl-java primary clone (on java-11-jakarta-full-wsdl)
-git worktree add ../hi-wsdl-java-java-8-javax java-8-javax
-git worktree add ../hi-wsdl-java-java-11-jakarta java-11-jakarta
-
-# Apply edits in each ../hi-wsdl-java-* folder; commit per branch
-# When finished:
-git worktree remove ../hi-wsdl-java-java-8-javax
-git worktree remove ../hi-wsdl-java-java-11-jakarta
-```
\ No newline at end of file
+git worktree add <path> java-8
+git worktree add <path> java-11
+```
diff --git a/.cursor/rules/pcehr-compiled-wsdl-project.mdc b/.cursor/rules/pcehr-compiled-wsdl-project.mdc
deleted file mode 100644
index 87c0745..0000000
--- a/.cursor/rules/pcehr-compiled-wsdl-project.mdc
+++ /dev/null
@@ -1,51 +0,0 @@
----
-description: PCEHR compiled WSDL repo layout, release lines, and build
-alwaysApply: true
----
-
-# pcehr-compiled-wsdl-java
-
-Maven artifact **`au.gov.nehta:pcehr-compiled-wsdl`** — MHR **PCEHR B2B** WSDL resources and pre-generated JAX-WS/JAXB types. **Not** facade clients (**mhr-b2b-client-java**). **Not** Healthcare Identifiers (**hi-wsdl-java** / **hi-b2b-client-java**).
-
-## Documentation
-
-Follow **`documentation-standards.mdc`**. Integrator docs use **version numbers** — not Git branch names.
-
-| Version | Java | XML stack | `Service` stubs |
-| ------- | ---- | --------- | ----------------- |
-| **1.6.3** | 8 | **javax** / EE4J **`jaxws-rt` 2.3.x** in consumers | **12** (MHR B2B) |
-
-**Git branch mapping (maintainers only — never in integrator docs):**
-
-| Version | Git branch |
-| ------- | ---------- |
-| **1.6.3** | `java-8-javax` or `java-8-javax-full-wsdl` |
-| Java **11** / Jakarta types line | `java-11-jakarta-full-wsdl` (separate checkout; MHR facade clients on **mhr-b2b-client-java** **`java-11-jakarta`**) |
-
-## This checkout
-
-**`1.6.3-SNAPSHOT`**: Java **8**, **`javax`** committed types, **12** MHR B2B **`@WebServiceClient`** services. WSDL under **`src/main/resources/wsdl/`** and legacy tree **`src/main/java/wsdls/`** — **committed** (not separately licensed like HI WSDL). **`pcehr_override/`** xmldsig package. Sources **frozen** — no **`wsimport`** in this POM.
-
-## Build
-
-- JDK **8+**, from repo root: `mvn -B "-Dgpg.skip=true" clean verify` (quote `-D` on PowerShell).
-- Default build uses **committed** `src/main/java` — no wsimport.
-- After wsimport regeneration: **`python scripts/fix-javadoc.py`** then **`mvn verify`** (**`doclint=all`**, **`failOnWarnings=true`**).
-- Consumers add Eclipse EE4J **`com.sun.xml.ws:jaxws-rt` 2.3.7** at runtime — **not** Metro **`webservices-*`**.
-
-## vs mhr-b2b-client-java
-
-| | **pcehr-compiled-wsdl-java** | **mhr-b2b-client-java** |
-|---|---|---|
-| Delivers | WSDL on classpath + generated types | Facade clients, TLS, signing |
-| Artifact | `pcehr-compiled-wsdl` | `mhr-b2b-client` |
-| Java **11** / Jakarta | Separate branch here; facades in **mhr-b2b-client-java** | In-repo **`wsimport`** on **`java-11-jakarta`** |
-
-Align **`pcehr-compiled-wsdl`** and **`mhr-b2b-client`** at the **same version** on the Java **8** line (**`1.6.3`**). **`mvn install`** this types JAR before unpublished **`mhr-b2b-client`** **`verify`**.
-
-## Doc split
-
-- **`documentation-standards.mdc`**: implementor-first, Maven Central default, local/OS sections, relative paths, no secrets
-- **`README.md`**: integrators (Maven Central default)
-- **`CONTRIBUTING.md`**: build from source, local SNAPSHOT, regeneration notes
-- **`MAINTAINERS.md`**: POM / Javadoc / release internals
diff --git a/.cursor/rules/worktrees.mdc b/.cursor/rules/worktrees.mdc
index d1dc2fb..c2789ba 100644
--- a/.cursor/rules/worktrees.mdc
+++ b/.cursor/rules/worktrees.mdc
@@ -13,7 +13,7 @@ Follow **`documentation-standards.mdc`** (implementor-first, Maven Central defau
 
 | Doc | Audience | Use |
 | --- | -------- | --- |
-| **README**, integrator guides | Implementors | **Maven version** (`1.6.3`), Central coordinates, runtime config |
+| **README**, integrator guides | Implementors | **Maven version** (`8.0.0`), Central coordinates, JAR contents (WSDL + types) |
 | **CONTRIBUTING** | Contributors | Build from source, **Local builds**, OS-specific steps |
 | **MAINTAINERS**, **`.cursor/rules/`** | Maintainers | POM internals; **branch mapping** only when labelled maintainer-only |
 
@@ -21,13 +21,13 @@ Integrator docs: **version numbers**, not Git branch names. Local/SNAPSHOT flows
 
 ## Do not put in tracked docs
 
-- Hardcoded worktree or machine paths (`wt/`, `C:\…`, `/Users/…`, `~/`, `this worktree`, `primary clone`)
+- Hardcoded worktree or machine paths (`wt/`, `C:\...`, `/Users/...`, `~/`, `this worktree`, `primary clone`)
 - References to **`wt/README.md`** or other local-only layout files
-- “Open folder X to switch branches” — IDE/local workflow, not repo documentation
+- "Open folder X to switch branches" - IDE/local workflow, not repo documentation
 
 ## Allowed (maintainer-only, when labelled)
 
-- **Git branch mapping** table (version → branch) in **MAINTAINERS.md** or agent rules
+- **Git branch mapping** table (version -> branch) in **MAINTAINERS.md** or agent rules
 - Generic worktree example only: `git worktree add <path> <branch>` (placeholder **`<path>`**, never a committed example)
 - Optional **untracked** local notes outside the repo
 
diff --git a/.gitattributes b/.gitattributes
index 6313b56..b068fb2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,27 @@
+# Text files: LF in the index and on checkout (see *.bat / *.cmd below for CRLF).
+# Windows: git config core.autocrlf false once per clone so Git does not fight these rules.
+# After changing this file: git add --renormalize .
+# Optional (less diff noise if old blobs had stray CR): git config diff.ignoreCrAtEol true
 * text=auto eol=lf
+
+# Never treat these as text (no CRLF/LF conversion)
+*.class binary
+*.dll binary
+*.ear binary
+*.jar binary
+*.jks binary
+*.keystore binary
+*.pdf binary
+*.png binary
+*.gif binary
+*.ico binary
+*.jpeg binary
+*.jpg binary
+*.war binary
+*.woff binary
+*.woff2 binary
+*.zip binary
+
+# cmd.exe reliably parses these with CRLF; keep them out of LF normalization churn
+*.bat text eol=crlf
+*.cmd text eol=crlf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index acfcbb1..68c2630 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,22 +2,22 @@ name: CI
 
 on:
   push:
-    branches: [ master, main, java-8-javax-full-wsdl ]
+    branches: [ java-8 ]
   pull_request:
-    branches: [ master, main, java-8-javax-full-wsdl ]
+    branches: [ java-8 ]
 
 permissions:
   contents: read
 
 jobs:
-  build:
+  verify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: "8"
           cache: maven
-      - name: Build and test
+      - name: Maven verify
         run: mvn -B "-Dgpg.skip=true" clean verify
diff --git a/AGENTS.md b/AGENTS.md
index 4bb9378..0943610 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,9 +4,10 @@ Rules: `.cursor/rules/*.mdc`. Do not duplicate in README or CONTRIBUTING.
 
 | Concern | Rule |
 |---------|------|
+| ASCII only in authored files | `ascii-source.mdc` |
 | Documentation and build scripts (implementor-first, Central, local, OS, paths, no secrets) | `documentation-standards.mdc` |
-| PCEHR compiled WSDL scope, build, version lines | `pcehr-compiled-wsdl-project.mdc` |
+| MHR WSDL scope, build, version lines | `mhr-wsdl-project.mdc` |
 | Worktrees local only; versions in integrator docs | `worktrees.mdc` |
-| Multi-branch edits in one repo — use worktree, not checkout/stash | `multi-branch-worktrees.mdc` |
+| Multi-branch edits in one repo - use worktree, not checkout/stash | `multi-branch-worktrees.mdc` |
 
 Contributors (humans): README, CONTRIBUTING, MAINTAINERS, SECURITY, CHANGELOG.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65e3797..18cb0e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,22 @@
 # Change Log/Revision History
 
-= 1.6.3-SNAPSHOT =
-======
+= 8.0.0 =
+=======
+- Maven **`au.gov.nehta:mhr-wsdl`** **8.0.0** (Java **8** / **`javax`**, **12** `Service` stubs). The first number of the Maven version is the targeted Java SE version. Consumers that pin **`mhr-wsdl`** to **`${project.version}`** (including **`mhr-b2b-client`**) use the same coordinate.
+- Java packages and types use **`mhr`** names (`ns.mhr`, **`MHRHeader`**, **`RegisterMHRService`**). SOAP namespaces and element names remain the B2B **`pcehr`** wire contract.
+- Compile: **`javax.xml.bind:jaxb-api` 2.3.1**, **`javax.xml.ws:jaxws-api` 2.3.1**, **`javax.jws:javax.jws-api` 1.1**. **`maven-enforcer-plugin`** bans Metro **`webservices-*`** and **`jakarta.*`** XML APIs. Consuming apps use **`jaxws-rt` 2.3.7** at runtime.
+- POM: Sonatype Central Portal (**`central-publishing-maven-plugin`**; server id **`central`**).
+- Offline unit tests: **`JavaxStackTest`**, **`MhrWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`**, **`WsdlStubContractTest`** under **`src/test/java/au/gov/nehta/mhrwsdl/`**.
+- Documentation: README, CONTRIBUTING, MAINTAINERS, SECURITY.
+
+= 1.6.3 =
+=========
+Historical past release (superseded by **8.0.0** on this line).
 - **`1.6.3`** line: Java **8** / **`javax`** committed types and classpath WSDL (**12** `Service` stubs, MHR B2B scope).
 - POM: **`provided`** compile **`jaxb-api`**, **`jaxws-api`**, **`javax.jws-api`**; **`maven-enforcer-plugin`** bans Metro **`webservices-*`** and **`jakarta.*`** (consumers use EE4J **`jaxws-rt` 2.3.7**). Build plugins aligned with **hi-wsdl-java** **`1.6.3`**.
-- **`maven-javadoc-plugin`:** **`doclint=all`**, **`failOnWarnings=true`** — Javadoc repaired in source via **`scripts/fix-javadoc.py`**.
 - **`maven-gpg-plugin`:** **`gpg.skip`** defaults to **`true`** for local builds.
-- Offline unit tests: **`JavaxStackTest`**, **`PcehrCompiledWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`** under **`src/test/java/au/gov/nehta/pcehrwsdl/`**.
-- CI: **`.github/workflows/ci.yml`** (Java **8**, **`mvn verify`**).
+- Offline unit tests: **`JavaxStackTest`**, **`MhrWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`** under **`src/test/java/au/gov/nehta/mhrwsdl/`**.
+- Javadoc: **`doclint=all`**, **`failOnWarnings=true`**.
 - Documentation: README, CONTRIBUTING, MAINTAINERS, SECURITY.
 
 = 1.1.1 =
@@ -21,3 +30,7 @@
 = 1.0.0 =
 =========
 - Initial version
+
+## Copyright
+
+Copyright 2012 NEHTA. Copyright 2021-2026 ADHA. Apache License 2.0 - see **LICENSE.txt**.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8a12569..b874aa6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,35 +1,49 @@
 # Contributing
 
-**Audience:** developers building or changing **this repository**. Integrators should use **README.md** and Maven Central coordinates.
+**Audience:** developers building or changing **this repository**. Integrators should use **README.md** and Maven Central coordinates. See **SECURITY.md** before committing.
 
 ## Prerequisites
 
-- **JDK 8** with **`JAVA_HOME`** set.
+- **JDK 8+** with **`JAVA_HOME`** set (see **`maven.compiler.release`** in **`pom.xml`**).
 - **Maven 3.6+** on **`PATH`**.
 
+Dependencies resolve from **[Maven Central](https://central.sonatype.com/)** unless you are installing a **local SNAPSHOT** (below). This POM has no sibling Maven modules.
+
+## Versioning
+
+The **first number** of **`au.gov.nehta:mhr-wsdl`** is the **Java SE** version that this types JAR targets. **8.0.0** is **`javax`** with **12** `Service` stubs; **11.0.0.1** and later are **Jakarta** with **12** stubs. See **`README.md`**.
+
+Consumers that pin **`mhr-wsdl`** to **`${project.version}`** (including **`mhr-b2b-client`**) must use the **same** version as this **`pom.xml`**.
+
 ## Build
 
 From the project root:
 
 ```text
-mvn -B clean verify
+mvn -B "-Dgpg.skip=true" clean verify
 ```
 
+This line (**`8.0.0`**) compiles **committed** types - it does **not** run **`wsimport`**.
+
 | Goal | Command |
 | ---- | ------- |
-| Compile + attach sources/Javadoc | `mvn -B clean verify` |
-| Run unit tests only | `mvn -B clean test` |
-| Skip tests | `mvn -B clean verify "-DskipTests=true"` |
-| Signed release (GPG on **`PATH`**) | `mvn -B "-Dgpg.skip=false" clean verify` |
-| Install SNAPSHOT for sibling client build | `mvn -B "-Dgpg.skip=true" clean install` — required before **`mhr-b2b-client-java`** **`verify`** when both repos are at matching **`*-SNAPSHOT`** versions |
+| Compile + attach sources/Javadoc | `mvn -B "-Dgpg.skip=true" clean verify` |
+| Skip tests | `mvn -B "-Dgpg.skip=true" clean verify "-DskipTests=true"` |
+| Install SNAPSHOT to the local Maven repository | `mvn -B "-Dgpg.skip=true" clean install` |
 
-GPG signing is skipped by default (**`gpg.skip=true`** in **`pom.xml`**). Release builds: **`-Dgpg.skip=false`**.
+GPG signing is skipped by default (**`-Dgpg.skip=true`**). Release builds: **`-Dgpg.skip=false`**.
 
 ## Dependencies
 
-- Compile ( **`provided`** ): **`javax.xml.bind:jaxb-api`**, **`javax.xml.ws:jaxws-api`**, **`javax.jws:javax.jws-api`** only — on the JDK 8 classpath; **`provided`** so they are not transitive to consumers.
-- Runtime SOAP stack: Eclipse EE4J **`com.sun.xml.ws:jaxws-rt`** **2.3.7** in **consuming** applications — **not** legacy Metro **`webservices-*`** bundles.
-- **`maven-enforcer-plugin`** rejects Metro **`webservices-*`**, all **`jakarta.*`** XML API coordinates, and runtime JAX-WS/JAXB implementations in this POM (**`javax`** API deps only).
+- Compile: **`javax.xml.bind:jaxb-api` 2.3.1**, **`javax.xml.ws:jaxws-api` 2.3.1**, and **`javax.jws:javax.jws-api` 1.1**.
+- Runtime SOAP stack: **`com.sun.xml.ws:jaxws-rt`** **2.3.7** in **consuming** applications (this JAR does not ship it).
+- **`maven-enforcer-plugin`** rejects Metro **`webservices-*`** and **`jakarta.*`** XML API coordinates on the classpath.
+
+## Local builds (unpublished artifacts)
+
+**`mvn install`** here is enough for any unpublished consumer of **`au.gov.nehta:mhr-wsdl`** at **`${project.version}`**. Integrators using GA versions from Maven Central do not need a source checkout.
+
+Maintainer notes: **MAINTAINERS.md**.
 
 ## Regenerating sources
 
@@ -38,19 +52,14 @@ Generated Java under **`src/main/java`** (outside **`wsdls/`**) is **committed**
 To refresh types after a WSDL change on this line:
 
 1. Regenerate from the WSDL/XSD in **this** repository (**`src/main/resources/wsdl/`**, **`src/main/java/wsdls/`**) using **`wsimport`** on Java **8** / **`javax`**.
-2. Preserve public API: same class names, packages, and **`pcehr_override`** xmldsig layout.
-3. Run **`python scripts/fix-javadoc.py`** to repair wsimport Javadoc (escaped schema fragments, **`@param`** / **`@return`** tags).
+2. Preserve public API: same class names, packages, and **`mhr_override`** xmldsig layout.
+3. Fix known JAXB Javadoc issues (for example replace **`{@link byte[]}`** with **`{@code byte[]}`** in **`mhr_override/`**).
 4. Run **`mvn -B "-Dgpg.skip=true" clean verify`** and update **CHANGELOG.md**.
 
-Java **11** / **Jakarta** MHR type regeneration and facade clients are maintained in **[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)**, not this repository.
+Type regeneration for new MHR releases on **Jakarta** lines is on **11.0.0.1** and later.
 
 ## Repository hygiene
 
-- **Do not commit** keystores, production MHR endpoint URLs, populated **`settings.xml`** with release credentials, or **`local.properties`** with secrets. See **SECURITY.md**.
-- **`1.6.3`:** generated Java under **`src/main/java`** is frozen — this POM has no **`wsimport`** profile.
-- **Changes:** Keep commits focused; match existing generated-code style.
-- Maintainer notes: **MAINTAINERS.md**.
-
-## Copyright
-
-Copyright 2012 NEHTA. Copyright 2021-2026 ADHA. Apache License 2.0 — see **LICENSE.txt**.
+- **Do not commit** keystores, production MHR URLs, populated **`settings.xml`** with release credentials, or **`local.properties`** with secrets. See **SECURITY.md**.
+- **`8.0.0`:** generated Java under **`src/main/java`** is frozen - this POM has no **`wsimport`** / XJC profile.
+- **Line endings:** the repository uses **LF** (see **`.gitattributes`**). On **Windows**, run **`git config core.autocrlf false`** in your clone before committing.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 5a17482..c4d82d3 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,60 +1,90 @@
-# Maintainer guide
+# Maintainer notes
 
-Paths are relative to the repository root (directory containing **`pom.xml`**).
+**Audience:** people changing the **`mhr-wsdl`** build, generated types, WSDL layout, or release process - not library integrators. Integrators should use **README.md**, published Javadoc, and **`pom.xml`** coordinates.
 
-## Release line
+Paths are relative to the repository root (directory containing **`pom.xml`**). This Git repository is **`mhr-wsdl-java`**; the Maven artifact id remains **`mhr-wsdl`**.
 
-**Documentation convention:** README, CONTRIBUTING, CHANGELOG, and integrator-facing text use **version numbers only** — never Git branch names.
+## Versioning
 
-| Version | Java | APIs | `Service` stubs |
-| ------- | ---- | ---- | ----------------- |
-| **1.6.3** | 8 | **`javax.xml.ws`**, **`javax.xml.bind`**, **`javax.jws`** | **12** (MHR B2B) |
+The **first number** of **`<version>`** is the **Java SE** target of **this** types JAR.
 
-**Git branch (maintainers / checkout only — do not use in integrator docs):** **`java-8-javax`** or **`java-8-javax-full-wsdl`**.
+| Maven version | Java SE |
+| ------------- | ------- |
+| **8.0.0** | **8** |
+| **11.0.0.1** | **11** |
+| **17.0.0.1** | **17** |
+| **21.0.0.1** | **21** |
+| **24.0.0.1** | **24** |
 
-**This tree (`1.6.3-SNAPSHOT`):** Java **8**, committed **`javax`** generated types, **12** primary MHR B2B **`@WebServiceClient`** services. Sources are **frozen** in Git (no **`wsimport`** in this POM). **`mhr-b2b-client-java`** (**`master`**) resolves **`pcehr-compiled-wsdl`** at **`${project.version}`** — **`mvn install`** here before an unpublished client **`verify`**. GA **`1.6.3`** pairs ship to Maven Central together. Java **11** / **Jakarta** MHR facade clients live in **[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)** **`java-11-jakarta`** — separate artifact line.
+**Documentation convention:** README, CONTRIBUTING, CHANGELOG, and integrator-facing text use **version numbers only** - never Git branch names.
+
+| Version | Java | XML APIs | `Service` stubs |
+| ------- | ---- | -------- | --------------- |
+| **8.0.0** | 8 | **`javax.xml.ws`**, **`javax.xml.bind`**, **`javax.jws`** | **12** (MHR B2B) |
+| **11.0.0.1** | 11 | **Jakarta** XML WS / Bind | **12** (MHR B2B) |
+| **17.0.0.1** | 17 | **Jakarta** XML WS / Bind | **12** (MHR B2B) |
+| **21.0.0.1** | 21 | **Jakarta** XML WS / Bind | **12** (MHR B2B) |
+| **24.0.0.1** | 24 | **Jakarta** XML WS / Bind | **12** (MHR B2B) |
+
+**Git branch mapping (maintainers / checkout only - do not use in integrator docs):**
+
+| Version | Official Git branch |
+| ------- | ------------------- |
+| **8.0.0** | `java-8` |
+| **11.0.0.1** | `java-11` |
+| **17.0.0.1** | `java-17` |
+| **21.0.0.1** | `java-21` |
+| **24.0.0.1** | `java-24` |
+
+Artifact id stays **`mhr-wsdl`**; the version distinguishes the Java SE line. Downstream projects that pin **`mhr-wsdl`** to **`${project.version}`** (including **`mhr-b2b-client`**) keep the **same** version and the **same** branch names on their matching line.
+
+On a given branch, **do not change the first number** of **`<version>`**. Next GA on **`java-8`** is **`8.0.0.2`** (then **`8.0.1-SNAPSHOT`**), not **`11.x`**. A new Java SE target is a **new branch**, not a bump on this one.
+
+**This checkout (`8.0.0-SNAPSHOT`):** Java **8**, committed **`javax`** generated types, **12** primary MHR B2B **`@WebServiceClient`** services (no **`wsimport`** / XJC in this POM). Stack and **`.github/workflows/ci.yml`** (branch **`java-8`**, JDK **8**) below apply to **this line only**. Other branches keep their own **`pom.xml`**, CI branch filter, and JDK. Type regeneration for new MHR releases is on **11.0.0.1** and later lines.
 
 ## Artifact
 
-- **`au.gov.nehta:pcehr-compiled-wsdl`** — MHR B2B WSDL on the classpath + pre-generated JAX-WS/JAXB types.
-- **Not included:** PCEHR facade clients, TLS/signing, or custom runtime WSDL resolution (**[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)** is a separate artifact and does not depend on this JAR).
+- **`au.gov.nehta:mhr-wsdl`** - MHR B2B WSDL on the classpath + pre-generated JAX-WS/JAXB types.
+- **Not included:** facade clients, TLS/signing, or custom runtime WSDL resolution (**[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)**).
 
 ## Layout
 
 | Path | Role |
 | ---- | ---- |
 | `src/main/resources/wsdl/` | **`B2B_*.wsdl`** packaged under **`/wsdl/`** in the JAR |
-| `src/main/java/wsdls/` | Legacy WSDL/XSD reference tree (**`wsdls/wsdl/External/`**, **`wsdls/schema/`**) |
+| `src/main/java/wsdls/` | WSDL/XSD reference tree (**`wsdls/wsdl/External/`**, **`wsdls/schema/`**) |
 | `src/main/java/` | Committed generated types + **`au.gov.nehta.schema.DateAdapter`** |
-| `src/main/java/pcehr_override/` | xmldsig types (override package) |
+| `src/main/java/mhr_override/` | xmldsig types (override package) |
 | `scripts/fix-javadoc.py` | Repair wsimport Javadoc after regeneration |
 
-There is **no** in-repo **`wsimport`** profile. Offline unit tests under **`src/test/java/au/gov/nehta/pcehrwsdl/`** (javax stack, WSDL classpath, generated binding smoke tests).
+## Release scope (`8.0.0`)
 
-## Build (`1.6.3` line)
+- **Goal:** Java **8** bytecode (`maven.compiler.release` **8**) with **`javax`** generated types; **12** MHR B2B **`Service`** stubs.
+- The default lifecycle does **not** run **`wsimport`**. **`src/main/java`** and **`mhr_override/`** are committed as-is.
 
-- **`maven.compiler.release`** **8**
-- Compile deps ( **`provided`** ): **`jaxb-api` 2.3.1**, **`jaxws-api` 2.3.1**, **`javax.jws-api` 1.1** — no **`jaxws-rt`** in this POM
-- **`maven-enforcer-plugin`:** bans Metro **`webservices-*`**, all **`jakarta.*`** XML APIs — not EE4J **`jaxws-rt`** (that belongs in consuming apps)
-- Consumers: Eclipse EE4J **`com.sun.xml.ws:jaxws-rt` 2.3.7** (last **2.3.x** on Central for Java **8**)
-- **`maven-gpg-plugin`:** skipped unless **`-Dgpg.skip=false`**
-- **`maven-javadoc-plugin`:** **`doclint=all`**, **`failOnWarnings=true`**, **`detectOfflineLinks=false`**
-- Javadoc fixes after wsimport: **`python scripts/fix-javadoc.py`**
-- Build plugins aligned with **hi-wsdl-java** **`1.6.3`** (Java **8**–compatible latest releases)
-- **No source regeneration** on **`1.6.3`** — **`src/main/java`** and **`pcehr_override/`** are committed as-is
+## Contributors vs release publisher (`pom.xml`)
+
+**Contributors (PRs, ordinary commits):** Do not change **`<version>`** (stay on **`-SNAPSHOT`** unless the maintainer requests a bump), **`<scm><tag>`**, or **`distributionManagement`**. If a maintainer requests a SNAPSHOT bump on this branch, change only the trailing numbers (**`8.0.1-SNAPSHOT`**), never the Java SE digit. Leave **`maven-gpg-plugin`** **`skip`** **`true`** so default **`mvn verify`** does not require a signing key. Record user-visible work under **`CHANGELOG.md`** in the **`= <pom-version> =`** block that matches **`pom.xml`** **`<version>`**.
+
+**Release publisher:** In the release change set: set **`<version>`** to the GA coordinate (no **`-SNAPSHOT`**); set **`<scm><tag>`** to the Git tag you will publish (match existing tag naming). Move **`CHANGELOG.md`** bullets from the snapshot section into a new **`= <GA-version> =`** section; add a fresh **`-SNAPSHOT`** block for the next development cycle. Deploy via Sonatype Central Portal (**`central-publishing-maven-plugin`**; copy **`settings.xml.example`** -> **`settings.xml`**, server id **`central`**). See **Release** below.
 
 ## Release
 
-Publishing uses **`central-publishing-maven-plugin`** (Sonatype Central Portal). Copy **`settings.xml.example`** → **`settings.xml`**, server id **`central`**.
+Publishing uses **`central-publishing-maven-plugin`** (Sonatype Central Portal). Copy **`settings.xml.example`** -> **`settings.xml`**, server id **`central`**.
+
+**Parallel release lines (maintainers only):** each Git branch of **this** repository publishes a **different Maven version** of **`mhr-wsdl`**. Integrators choose by coordinate, not branch name. The first number of that version is the targeted Java SE version. Run **`release:prepare` / `release:perform`** (or manual deploy) **on that branch** (not detached HEAD).
 
-**Parallel release lines (maintainers only):** each Git branch publishes a **different Maven version** — integrators choose by coordinate, not branch name.
+| Branch | Java | `mhr-wsdl` | `Service` stubs |
+| ------ | ---- | --------------------- | --------------- |
+| **`java-8`** | 8 / javax | **8.0.0** | 12 |
+| **`java-11`** | 11 / Jakarta | **11.0.0.1** | 12 |
+| **`java-17`** | 17 / Jakarta | **17.0.0.1** | 12 |
+| **`java-21`** | 21 / Jakarta | **21.0.0.1** | 12 |
+| **`java-24`** | 24 / Jakarta | **24.0.0.1** | 12 |
 
-| Branch | Java | types / client version | `Service` stubs |
-| ------ | ---- | ---------------------- | --------------- |
-| **`java-8-javax-full-wsdl`** | 8 / javax | **1.6.3** | 12 |
-| **`java-11-jakarta-full-wsdl`** | 11 / Jakarta | **1.7.0** | 12 |
+**Order:** publish **this artifact** first. Any consumer that depends on **`mhr-wsdl`** at the same GA (including **`mhr-b2b-client`**) cannot complete **`verify`** / **`release:perform`** until this coordinate is on Central (or installed locally).
 
-Release **`pcehr-compiled-wsdl`** and **`mhr-b2b-client`** at the **same GA version** on the matching branch pair before integrators upgrade.
+**`-DdevelopmentVersion`:** keep the same first number as **`-DreleaseVersion`** (example on this line: **`8.0.0`** then **`8.0.1-SNAPSHOT`**).
 
 ### SNAPSHOT or manual GA
 
@@ -62,31 +92,57 @@ Release **`pcehr-compiled-wsdl`** and **`mhr-b2b-client`** at the **same GA vers
 2. **`mvn -B "-Prelease" clean verify`**
 3. **`mvn -B "-Prelease" deploy`**
 
-Git/SCM settings for **`maven-release-plugin`** live in **`pom.xml`** properties (**`scm.repo.url`**, **`release.*`**). Tags default to **`{artifactId}-{version}`** (e.g. **`pcehr-compiled-wsdl-1.7.0`**).
+Git/SCM settings for **`maven-release-plugin`** live in **`pom.xml`** properties (**`scm.repo.url`**, **`release.*`**). Tags default to **`{artifactId}-{version}`** (e.g. **`mhr-wsdl-8.0.0`**).
 
 ### Automated GA (`maven-release-plugin`)
 
 Run on the **target branch** with a **clean** working tree. The plugin commits version bumps, creates the release tag, deploys from the tag checkout, bumps to the next **`-SNAPSHOT`**, and **pushes branch + tag** (**`pushChanges`** / **`remoteTagging`** in **`pom.xml`**). Git remote credentials (SSH or HTTPS) must work non-interactively.
 
 ```text
-mvn -B "-Prelease" release:prepare release:perform -DreleaseVersion=1.7.0 -DdevelopmentVersion=1.7.1-SNAPSHOT -Dtag=pcehr-compiled-wsdl-1.7.0
+mvn -B "-Prelease" release:prepare release:perform -DreleaseVersion=8.0.0 -DdevelopmentVersion=8.0.1-SNAPSHOT -Dtag=mhr-wsdl-8.0.0
 ```
 
-Replace versions and **`-Dtag`** for the branch you are on (**`mhr-b2b-client-1.6.3`**, **`pcehr-compiled-wsdl-1.6.3`**, etc.). Omit **`-D…`** only if you accept interactive prompts.
+Replace **`-DreleaseVersion`**, **`-DdevelopmentVersion`**, and **`-Dtag`** for the branch you are on (same first number; e.g. **`mhr-wsdl-11.0.0.1`** on **`java-11`**). Omit **`-D...`** only if you accept interactive prompts.
 
-**After success:** confirm the artifact on Central; repeat on the paired types/client repo. No extra Git steps unless push failed (then **`git push origin <branch>`** and **`git push origin <tag>`**).
+**After success:** confirm **`mhr-wsdl`** GA on Central. Downstream artifacts that pin this coordinate can then cut their matching GA. No extra Git steps unless push failed; then from the release branch:
+
+`git push origin java-8` (or **`java-11`**, **`java-17`**, **`java-21`**, **`java-24`**) and **`git push origin <tag>`**.
 
 **`-Dgpg.skip=false`** is equivalent to **`-Prelease`** for signing.
 
+## Changelog and releases
+
+**`CHANGELOG.md`** uses **`= version =`** section headers. Match the snapshot header to **`pom.xml`** **`<version>`** until the publisher cuts GA.
+
+## New Java SE line
+
+When adding a line (e.g. Java **25**): create **`java-25`** in **this** repository from the nearest existing types line; set **`<version>`** first number to **25** (e.g. **`25.0.0.1-SNAPSHOT`**); set **`maven.compiler.release`**, JAX-WS / JAXB coordinates, CI **`java-version`** / branch filter, WSDL/stub inventory, and docs to that line. Do not retarget an existing branch.
+
+Consumers that pin **`mhr-wsdl`** to **`${project.version}`** need a matching line of their own once this artifact exists.
+
+## Build (`8.0.0` line)
+
+This subsection is **this `java-8` checkout**. Other lines document their stack in their own **MAINTAINERS** / **`pom.xml`**.
+
+- **`maven.compiler.release` 8**
+- Compile deps: **`jaxb-api` 2.3.1**, **`jaxws-api` 2.3.1**, **`javax.jws-api` 1.1** - no **`jaxws-rt`** in this POM
+- **`maven-enforcer-plugin`:** bans Metro **`webservices-*`** and all **`jakarta.xml.*`** / **`jakarta.jws`** API coordinates (**`javax`** compile deps only)
+- Consuming applications add **`com.sun.xml.ws:jaxws-rt` 2.3.7** (Eclipse EE4J, last **2.3.x** on Central for Java **8**)
+- **`maven-gpg-plugin`:** skipped unless **`-Dgpg.skip=false`**
+- **`maven-javadoc-plugin`:** **`doclint=all`**, **`failOnWarnings=true`**, **`detectOfflineLinks=false`**
+- Javadoc fixes after wsimport: **`python scripts/fix-javadoc.py`**
+- **No source regeneration** on **`8.0.0`** - **`src/main/java`** and **`mhr_override/`** are committed as-is
+- **`.github/workflows/ci.yml`:** GitHub Actions **`mvn verify`** on **`java-8`**, JDK **8**
+
 ## Public commit checklist
 
 Before pushing to a **public** remote:
 
-1. **`git status`** — no keystores, **`settings.xml`**, or **`local.properties`** staged.
+1. **`git status`** - no keystores, **`settings.xml`**, or **`local.properties`** staged.
 2. No **`target/`** committed.
-3. **`mvn -B clean verify`** passes.
+3. **`mvn -B "-Dgpg.skip=true" clean verify`** passes.
 4. **CHANGELOG.md** and **`pom.xml`** version reflect the release line.
 
 ## Copyright
 
-Copyright 2012 NEHTA. Copyright 2021-2026 ADHA. Apache License 2.0 — see **LICENSE.txt**.
+Copyright 2012 NEHTA. Copyright 2021-2026 ADHA. Apache License 2.0 - see **LICENSE.txt**.
diff --git a/README.md b/README.md
index add3a06..a5036a9 100644
--- a/README.md
+++ b/README.md
@@ -1,83 +1,97 @@
-# PCEHR compiled WSDL library
+# MHR WSDL library
 
-Maven artifact **`au.gov.nehta:pcehr-compiled-wsdl`** — My Health Record **B2B WSDL resources** and **pre-generated JAX-WS / JAXB types** for PCEHR client development.
+Maven artifact **`au.gov.nehta:mhr-wsdl`** - My Health Record **B2B WSDL resources** and **pre-generated JAX-WS / JAXB types** for MHR client development.
 
-For hand-written facade clients, TLS, and signing, use **[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)**. This repository supplies the **generated type layer** and classpath WSDL only.
-
-## Release line
-
-| Version | Java | XML stack | MHR service scope |
-| ------- | ---- | --------- | ----------------- |
-| **1.6.3** | **8** | **`javax.*`** / EE4J **`jaxws-rt` 2.3.x** at runtime in consumers | **12** `Service` stubs |
-
-**This checkout** builds **`1.6.3-SNAPSHOT`** (Java **8** / **`javax`**) — **committed, frozen** generated types (no **`wsimport`** in the build).
-
-For Java **11** / **Jakarta** MHR B2B clients and in-repo **`wsimport`**, use **[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)** (**`mhr-b2b-client`**) — a separate artifact that does not depend on **`pcehr-compiled-wsdl`**.
+For facade clients, TLS, and signing, use **[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)**. This repository supplies the **generated type layer** and classpath WSDL only. The pairing is the same as **`hi-wsdl`** / **`hi-b2b-client`**: same Maven version, types JAR first.
 
 ## Dependency
 
-Published releases are consumed from **[Maven Central](https://central.sonatype.com/)** like any other dependency — no local build is required.
+Published releases are consumed from **[Maven Central](https://central.sonatype.com/)**. Use a **`<version>`** that matches your JDK (see **Versioning**).
 
 ```xml
 <dependency>
   <groupId>au.gov.nehta</groupId>
-  <artifactId>pcehr-compiled-wsdl</artifactId>
-  <version>VERSION</version>
+  <artifactId>mhr-wsdl</artifactId>
+  <version>8.0.0</version>
 </dependency>
 ```
 
-Add Eclipse EE4J **`com.sun.xml.ws:jaxws-rt`** **2.3.7** at runtime in your application when you invoke SOAP endpoints (**`javax.xml.ws`** / **`javax.xml.bind`**). This JAR does not bundle **`jaxws-rt`**. Do **not** use legacy Metro **`webservices-*`** bundles (**`webservices-rt`**, **`webservices-api`**, etc.).
+**This line (`8.0.0`):** Java **8**, **`javax.xml.ws`** / **`javax.xml.bind`**, **12** MHR B2B **`Service`** stubs, **committed** generated types (no **`wsimport`** in the build). Add Eclipse EE4J **`com.sun.xml.ws:jaxws-rt`** **2.3.7** at runtime in your application when you invoke SOAP endpoints. This JAR does not bundle **`jaxws-rt`**. Do **not** use legacy Metro **`webservices-*`** bundles.
+
+When **`mhr-b2b-client`** is also on the classpath, use the **same** Maven version for both artifacts.
+
+---
+
+## Versioning
+
+The **first number** of the Maven version is the **Java SE** version that this types JAR targets. Downstream artifacts that pin **`mhr-wsdl`** to **`${project.version}`** (including **`mhr-b2b-client`**) use that same coordinate on a given line.
+
+| Maven version | Java SE | XML stack | `Service` stubs |
+| ------------- | ------- | --------- | --------------- |
+| **8.0.0** | **8** | **`javax.*`** / EE4J **`jaxws-rt` 2.3.x** at runtime in consumers | **12** (MHR B2B) |
+| **11.0.0.1** | **11** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **12** (MHR B2B) |
+| **17.0.0.1** | **17** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **12** (MHR B2B) |
+| **21.0.0.1** | **21** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **12** (MHR B2B) |
+| **24.0.0.1** | **24** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **12** (MHR B2B) |
 
-Align **`pcehr-compiled-wsdl`** and **`mhr-b2b-client`** at the **same version** when both are on the classpath (GA **`1.6.3`** in the table above).
+Pick the coordinate that matches your JDK. Do not mix **`mhr-wsdl`** versions with a consumer that expects a different line. All published versions are on **[Maven Central](https://central.sonatype.com/)**.
+
+Java packages and type names use **`mhr`** (`au.net.electronichealth.ns.mhr`, **`MHRHeader`**, **`RegisterMHR`**, **`mhr_override`**). SOAP/XML namespaces, element names, and operation names stay the published B2B contract (`http://ns.electronichealth.net.au/pcehr/...`, **`PCEHRHeader`**, **`registerPCEHR`**).
+
+---
+
+## Note
+
+The **8.0.0** JAR ships **12** MHR B2B **`Service`** stubs on **`javax`**. **11.0.0.1** and later lines use **Jakarta** with the same stub count.
+
+---
 
 ## Local development (SNAPSHOT)
 
-This repository builds **`1.6.3-SNAPSHOT`** on the Java **8** / **`javax`** line. **`mhr-b2b-client-java`** (**`master`**) declares **`au.gov.nehta:pcehr-compiled-wsdl`** at **`${project.version}`** — install this types JAR **first** when both checkouts are unpublished:
+This repository builds **`8.0.0-SNAPSHOT`**. The default lifecycle compiles **committed** types only. To make an unpublished JAR resolvable for other local projects:
 
 ```text
-# 1) pcehr-compiled-wsdl-java (java-8-javax)
 mvn -B "-Dgpg.skip=true" clean install
-
-# 2) mhr-b2b-client-java (master)
-mvn -B "-Dgpg.skip=true" clean verify
 ```
 
-If Maven warns that a **GA** POM is missing (for example **`1.6.3`** before Central publish), clear stale **`au/gov/nehta/pcehr-compiled-wsdl`** entries in your **local Maven repository** (folders with only **`.lastUpdated`** files) and reinstall the SNAPSHOT. **`mvn clean`** in one project does not clear the local repository cache.
+Consumers that declare **`au.gov.nehta:mhr-wsdl`** at **`${project.version}`** (including **`mhr-b2b-client-java`**) need that install (or a Central GA) before their **`verify`**.
+
+If Maven warns that a **GA** POM is missing (for example **`8.0.0`** before Central publish), clear stale **`au/gov/nehta/mhr-wsdl`** entries in your **local Maven repository** (folders with only **`.lastUpdated`** files) and reinstall the SNAPSHOT. **`mvn clean`** in this project does not clear the local repository cache.
 
 ## What is in the JAR
 
 | Content | Location in repo |
 | ------- | ---------------- |
 | MHR B2B WSDL (classpath) | `src/main/resources/wsdl/B2B_*.wsdl` |
-| WSDL/XSD reference tree (legacy layout) | `src/main/java/wsdls/` (WSDL under `wsdls/wsdl/External/`; XSD under `wsdls/schema/`) |
+| WSDL/XSD reference tree | `src/main/java/wsdls/` |
 | Generated stubs (`javax`) | `src/main/java/` (excluding `wsdls/`) |
 | Date adapter | `src/main/java/au/gov/nehta/schema/DateAdapter.java` |
-| xmldsig override types | `src/main/java/pcehr_override/org/w3/` |
+| xmldsig override types | `src/main/java/mhr_override/org/w3/` |
 
-The published JAR includes **22** WSDL files under **`/wsdl/`** (12 service WSDLs plus 10 interface-only **`B2B_*Interface.wsdl`** files). Integrators load them from the classpath (for example **`ClassLoader.getResource("wsdl/B2B_PCEHRProfile.wsdl")`**) or pass an explicit **`URL`** to generated **`Service`** constructors.
+The published JAR includes **22** WSDL files under **`/wsdl/`**: 12 service WSDLs plus 10 interface-only **`B2B_*Interface.wsdl`** files. Integrators load them from the classpath, for example **`ClassLoader.getResource("wsdl/B2B_MHRProfile.wsdl")`**, or pass an explicit **`URL`** to generated **`Service`** constructors.
 
-Generated **`Service`** stubs cover **12** primary MHR B2B operations: document registry/repository; get audit, change-history, individual-details, representative-list, and view; get/search template; PCEHR profile; register PCEHR; remove document.
+Generated **`Service`** stubs cover 12 primary MHR B2B operations: document registry/repository; get audit, change-history, individual-details, representative-list, and view; get/search template; MHR profile; register MHR; remove document.
 
 ## Building from source
 
-**Audience:** contributors changing this repository — not integrators adding a Maven dependency.
+**Audience:** contributors changing this repository - not integrators adding a Maven dependency.
 
-Prerequisites: **JDK 8**, **Maven 3.6+**. All JAX-WS/JAXB types are **committed** in **`src/main/java`**; the build compiles them only (no codegen).
+Prerequisites: **JDK 8+**, **Maven 3.6+**. All JAX-WS/JAXB types are **committed** in **`src/main/java`**; the build compiles them only.
 
 ```text
-mvn -B clean verify
+mvn -B "-Dgpg.skip=true" clean verify
 ```
 
-GPG signing is skipped by default (**`gpg.skip=true`** in **`pom.xml`**). See **`CONTRIBUTING.md`** for optional **`mvn install`** when testing unpublished snapshots locally.
+See **`CONTRIBUTING.md`** for **`mvn install`** when testing unpublished snapshots locally.
 
 ## Related repositories
 
 | Repository | Role |
 | ---------- | ---- |
-| [mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java) | MHR facade clients (**`mhr-b2b-client`** — separate artifact; does not depend on **`pcehr-compiled-wsdl`**) |
+| [mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java) | MHR facade clients (depends on this artifact) |
 | [hi-wsdl-java](https://github.com/AuDigitalHealth/hi-wsdl-java) | HI WSDL/types (separate domain) |
 
-Confirm your organisation's redistribution terms for MHR B2B WSDL before mirroring this repository. Unlike **HI** WSDL (separately licensed — see **[hi-wsdl-java](https://github.com/AuDigitalHealth/hi-wsdl-java)**), **PCEHR B2B WSDL/XSD** in this repository are part of the published open-source artifact.
+Confirm your organisation's redistribution terms for MHR B2B WSDL before mirroring this repository. MHR B2B WSDL/XSD in this repository are part of the published open-source artifact.
 
 ## Documentation
 
@@ -86,7 +100,7 @@ Confirm your organisation's redistribution terms for MHR B2B WSDL before mirrori
 | **README.md** (this file) | Integrators |
 | **CONTRIBUTING.md** | Contributors |
 | **MAINTAINERS.md** | Releases and tooling |
-| **SECURITY.md** | Security reporting and secrets hygiene |
+| **SECURITY.md** | Secrets and reporting |
 | **CHANGELOG.md** | Release history |
 | **LICENSE.txt** | Apache License 2.0 + ADHA terms |
 
diff --git a/SECURITY.md b/SECURITY.md
index 837c1fe..f930c90 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,18 +2,17 @@
 
 ## If you integrate this library
 
-**`pcehr-compiled-wsdl`** provides WSDL resources and generated types. Do **not** embed mutual-TLS private keys, keystore passwords, or production MHR endpoint URLs in **your** application's source control.
+**`mhr-wsdl`** provides WSDL resources and generated types. Do **not** embed mutual-TLS private keys, keystore passwords, or production MHR endpoint URLs in **your** application's source control.
 
 ## Reporting issues
 
-For **security vulnerabilities in this library** (not routine support):
-
-1. Prefer **GitHub private vulnerability reporting** for this repository if it is enabled (**Security** tab → **Report a vulnerability**).
-2. Otherwise use your organisation's channel for **ADHA / AuDigitalHealth** repositories. Do **not** post exploit details, live credentials, or production URLs in a **public issue** before triage.
+Report security-sensitive findings through your organisation's usual channel for **ADHA / AuDigitalHealth** repositories (do not open a public issue with exploit details before it is triaged).
 
 ## This repository
 
-- **Do not commit secrets to git.** That includes passwords, API tokens, private keys, mutual-TLS keystores, and vendor registration material — even in comments, tests, or documentation tracked in this repository.
-- **Do not commit** populated **`local.properties`** or a repo-root **`settings.xml`** containing credentials.
+- **Do not commit secrets to git.** That includes passwords, API tokens, private keys, real mutual-TLS keystores, production or staging MHR endpoint URLs with embedded credentials, and vendor registration material - even inside comments, test fixtures, or tracked documentation.
+- **`local.properties`** is gitignored. Never commit real MHR credentials or keystores.
+- **`settings.xml`** at the repository root is gitignored when it contains release credentials; do not commit populated copies. Use **`settings.xml.example`** as the template (server id **`central`**).
 - **B2B WSDL and XSD** under **`src/main/resources/wsdl/`** and **`src/main/java/wsdls/`** are part of this open-source MHR types artifact (not separately licensed like **HI** WSDL). Confirm redistribution terms with ADHA before mirroring to a public fork.
 - Generated Java under **`src/main/java/`** is safe to commit; it contains no credentials.
+- In property files, prefer **forward slashes** in filesystem paths so the same values work on **Windows**, **macOS**, and **Linux**.
diff --git a/pom.xml b/pom.xml
index dc52182..498086d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>au.gov.nehta</groupId>
-    <artifactId>pcehr-compiled-wsdl</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
-    <name>PCEHR Compiled WSDL library</name>
-    <description>Java classes for B2B client development (Java 8 / javax)</description>
-    <url>https://github.com/AuDigitalHealth/pcehr-compiled-wsdl-java</url>
+    <artifactId>mhr-wsdl</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+    <name>MHR WSDL library</name>
+    <description>Java classes for My Health Record B2B client development (Java 8 / javax)</description>
+    <url>https://github.com/AuDigitalHealth/mhr-wsdl-java</url>
 
     <licenses>
         <license>
@@ -45,11 +45,11 @@
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/AuDigitalHealth/pcehr-compiled-wsdl-java/issues</url>
+        <url>https://github.com/AuDigitalHealth/mhr-wsdl-java/issues</url>
     </issueManagement>
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>https://github.com/AuDigitalHealth/pcehr-compiled-wsdl-java/actions</url>
+        <url>https://github.com/AuDigitalHealth/mhr-wsdl-java/actions</url>
     </ciManagement>
 
     <distributionManagement>
@@ -72,7 +72,7 @@
         <archetype.encoding>${encoding}</archetype.encoding>
         <gpg.skip>true</gpg.skip>
         <!-- SCM / maven-release-plugin (scm.repo.url is the only repo-specific Git value) -->
-        <scm.repo.url>https://github.com/AuDigitalHealth/pcehr-compiled-wsdl-java.git</scm.repo.url>
+        <scm.repo.url>https://github.com/AuDigitalHealth/mhr-wsdl-java.git</scm.repo.url>
         <scm.tag>HEAD</scm.tag>
         <release.localCheckout>true</release.localCheckout>
         <release.dryRun>false</release.dryRun>
@@ -106,19 +106,16 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>${jaxb.api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.ws</groupId>
             <artifactId>jaxws-api</artifactId>
             <version>${jaxws.api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.jws</groupId>
             <artifactId>javax.jws-api</artifactId>
             <version>${javax.jws.api.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -163,7 +160,7 @@
                                         <exclude>jakarta.activation:*</exclude>
                                         <exclude>jakarta.annotation:*</exclude>
                                     </excludes>
-                                    <message>Java 8 / javax line: use javax.xml.bind, javax.xml.ws, and javax.jws only. Consumers add EE4J jaxws-rt 2.3.x at runtime — not Metro webservices-* or Jakarta XML APIs.</message>
+                                    <message>Java 8 / javax line: use javax.xml.bind, javax.xml.ws, and javax.jws only. Consumers add EE4J jaxws-rt 2.3.x at runtime - not Metro webservices-* or Jakarta XML APIs.</message>
                                 </bannedDependencies>
                             </rules>
                         </configuration>
diff --git a/scripts/fix-javadoc.py b/scripts/fix-javadoc.py
index 9a983ce..2f46158 100644
--- a/scripts/fix-javadoc.py
+++ b/scripts/fix-javadoc.py
@@ -9,7 +9,7 @@
 SRC = ROOT / "src" / "main" / "java"
 
 PARAM_DESCRIPTIONS = {
-    "pcehrHeader": "PCEHR request header",
+    "mhrHeader": "MHR request header",
     "parameters0": "SOAP response holder",
     "timestampHeader": "timestamp SOAP header",
     "parameters": "request payload",
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/PCEHRProfilePortType.java b/src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/MHRProfilePortType.java
similarity index 77%
rename from src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/PCEHRProfilePortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/MHRProfilePortType.java
index 6b077a5..423729c 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/PCEHRProfilePortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/MHRProfilePortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.b2b.svc.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.b2b.svc.mhrprofile._1;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -11,11 +11,11 @@
 import javax.xml.ws.Holder;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1.DoesPCEHRExistResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1.DoesMHRExistResponse;
 
 
 /**
@@ -26,17 +26,17 @@
  */
 @WebService(name = "PCEHRProfilePortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1")
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
-public interface PCEHRProfilePortType {
+public interface MHRProfilePortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -52,45 +52,45 @@ public void doesPCEHRExist(
         @WebParam(name = "doesPCEHRExist", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", partName = "parameters")
         Object parameters,
         @WebParam(name = "doesPCEHRExistResponse", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", mode = WebParam.Mode.OUT, partName = "parameters")
-        Holder<DoesPCEHRExistResponse> parameters0,
+        Holder<DoesMHRExistResponse> parameters0,
         @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "timestampHeader")
         Timestamp timestampHeader,
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
     /**
      * 
      * @param individual individual parameter
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param responseStatus response status parameter
-     * @param pcehrRecord pcehr record parameter
+     * @param mhrRecord pcehr record parameter
      * @param timestampHeader timestamp SOAP header
      * @param signatureHeader signature SOAP header holder
      * @throws StandardErrorMsg if the service returns a StandardErrorMsg fault
      */
     @WebMethod
-    @RequestWrapper(localName = "gainPCEHRAccess", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", className = "au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1.GainPCEHRAccess")
-    @ResponseWrapper(localName = "gainPCEHRAccessResponse", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", className = "au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1.GainPCEHRAccessResponse")
+    @RequestWrapper(localName = "gainPCEHRAccess", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", className = "au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1.GainMHRAccess")
+    @ResponseWrapper(localName = "gainPCEHRAccessResponse", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", className = "au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1.GainMHRAccessResponse")
     @Action(input = "http://ns.electronichealth.net.au/pcehr/svc/PCEHRProfile/1.1/PCEHRProfilePortType/gainPCEHRAccessRequest", output = "http://ns.electronichealth.net.au/pcehr/svc/PCEHRProfile/1.1/PCEHRProfilePortType/gainPCEHRAccessResponse", fault = {
         @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/pcehr/svc/PCEHRProfile/1.1/PCEHRProfilePortType/Fault/standardError")
     })
     public void gainPCEHRAccess(
         @WebParam(name = "PCEHRRecord", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0")
-        au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1.GainPCEHRAccess.PCEHRRecord pcehrRecord,
+        au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1.GainMHRAccess.MHRRecord mhrRecord,
         @WebParam(name = "responseStatus", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", mode = WebParam.Mode.OUT)
         Holder<ResponseStatusType> responseStatus,
         @WebParam(name = "individual", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", mode = WebParam.Mode.OUT)
-        Holder<au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1.GainPCEHRAccessResponse.Individual> individual,
+        Holder<au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1.GainMHRAccessResponse.Individual> individual,
         @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "timestampHeader")
         Timestamp timestampHeader,
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/PCEHRProfileService.java b/src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/MHRProfileService.java
similarity index 67%
rename from src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/PCEHRProfileService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/MHRProfileService.java
index ed60cc7..24e0f9a 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/PCEHRProfileService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/MHRProfileService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.b2b.svc.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.b2b.svc.mhrprofile._1;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -16,8 +16,8 @@
  * Generated source version: 2.2
  * 
  */
-@WebServiceClient(name = "PCEHRProfileService", targetNamespace = "http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", wsdlLocation = "wsdl/B2B_PCEHRProfile.wsdl")
-public class PCEHRProfileService
+@WebServiceClient(name = "PCEHRProfileService", targetNamespace = "http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", wsdlLocation = "wsdl/B2B_MHRProfile.wsdl")
+public class MHRProfileService
     extends Service
 {
 
@@ -26,46 +26,46 @@ public class PCEHRProfileService
     private final static QName PCEHRPROFILESERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", "PCEHRProfileService");
 
     static {
-        PCEHRPROFILESERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.b2b.svc.pcehrprofile._1.PCEHRProfileService.class.getResource("wsdl/B2B_PCEHRProfile.wsdl");
+        PCEHRPROFILESERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.b2b.svc.mhrprofile._1.MHRProfileService.class.getResource("wsdl/B2B_MHRProfile.wsdl");
         WebServiceException e = null;
         if (PCEHRPROFILESERVICE_WSDL_LOCATION == null) {
-            e = new WebServiceException("Cannot find 'wsdl/B2B_PCEHRProfile.wsdl' wsdl. Place the resource correctly in the classpath.");
+            e = new WebServiceException("Cannot find 'wsdl/B2B_MHRProfile.wsdl' wsdl. Place the resource correctly in the classpath.");
         }
         PCEHRPROFILESERVICE_EXCEPTION = e;
     }
 
-    public PCEHRProfileService() {
+    public MHRProfileService() {
         super(__getWsdlLocation(), PCEHRPROFILESERVICE_QNAME);
     }
 
-    public PCEHRProfileService(WebServiceFeature... features) {
+    public MHRProfileService(WebServiceFeature... features) {
         super(__getWsdlLocation(), PCEHRPROFILESERVICE_QNAME, features);
     }
 
-    public PCEHRProfileService(URL wsdlLocation) {
+    public MHRProfileService(URL wsdlLocation) {
         super(wsdlLocation, PCEHRPROFILESERVICE_QNAME);
     }
 
-    public PCEHRProfileService(URL wsdlLocation, WebServiceFeature... features) {
+    public MHRProfileService(URL wsdlLocation, WebServiceFeature... features) {
         super(wsdlLocation, PCEHRPROFILESERVICE_QNAME, features);
     }
 
-    public PCEHRProfileService(URL wsdlLocation, QName serviceName) {
+    public MHRProfileService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
-    public PCEHRProfileService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+    public MHRProfileService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
         super(wsdlLocation, serviceName, features);
     }
 
     /**
      * 
      * @return the result
-     *     returns PCEHRProfilePortType
+     *     returns MHRProfilePortType
      */
     @WebEndpoint(name = "PCEHRProfileSOAP12Port")
-    public PCEHRProfilePortType getPCEHRProfileSOAP12Port() {
-        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", "PCEHRProfileSOAP12Port"), PCEHRProfilePortType.class);
+    public MHRProfilePortType getPCEHRProfileSOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", "PCEHRProfileSOAP12Port"), MHRProfilePortType.class);
     }
 
     /**
@@ -73,11 +73,11 @@ public PCEHRProfilePortType getPCEHRProfileSOAP12Port() {
      * @param features web service features
      *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return the result
-     *     returns PCEHRProfilePortType
+     *     returns MHRProfilePortType
      */
     @WebEndpoint(name = "PCEHRProfileSOAP12Port")
-    public PCEHRProfilePortType getPCEHRProfileSOAP12Port(WebServiceFeature... features) {
-        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", "PCEHRProfileSOAP12Port"), PCEHRProfilePortType.class, features);
+    public MHRProfilePortType getPCEHRProfileSOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1", "PCEHRProfileSOAP12Port"), MHRProfilePortType.class, features);
     }
 
     private static URL __getWsdlLocation() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/StandardErrorMsg.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/StandardErrorMsg.java
rename to src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/StandardErrorMsg.java
index 672dda2..8a0777e 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/b2b/svc/mhrprofile/_1/StandardErrorMsg.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getauditview._1;
+package au.net.electronichealth.ns.mhr.b2b.svc.mhrprofile._1;
 
 import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/GetAuditViewPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/GetAuditViewPortType.java
similarity index 77%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/GetAuditViewPortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/GetAuditViewPortType.java
index f46a2bc..382eac1 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/GetAuditViewPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/GetAuditViewPortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getauditview._1;
+package au.net.electronichealth.ns.mhr.svc.getauditview._1;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -9,11 +9,11 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1.GetAuditView;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1.GetAuditViewResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1.GetAuditView;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1.GetAuditViewResponse;
 
 
 /**
@@ -25,17 +25,17 @@
 @WebService(name = "GetAuditViewPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface GetAuditViewPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -56,7 +56,7 @@ public void getAuditView(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/GetAuditViewService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/GetAuditViewService.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/GetAuditViewService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/GetAuditViewService.java
index db39341..53e6077 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getauditview/_1/GetAuditViewService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/GetAuditViewService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getauditview._1;
+package au.net.electronichealth.ns.mhr.svc.getauditview._1;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -26,7 +26,7 @@ public class GetAuditViewService
     private final static QName GETAUDITVIEWSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1", "getAuditViewService");
 
     static {
-        GETAUDITVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.getauditview._1.GetAuditViewService.class.getResource("wsdl/B2B_GetAuditView.wsdl");
+        GETAUDITVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.getauditview._1.GetAuditViewService.class.getResource("wsdl/B2B_GetAuditView.wsdl");
         WebServiceException e = null;
         if (GETAUDITVIEWSERVICE_WSDL_LOCATION == null) {
             e = new WebServiceException("Cannot find 'wsdl/B2B_GetAuditView.wsdl' wsdl. Place the resource correctly in the classpath.");
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/StandardErrorMsg.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/StandardErrorMsg.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/StandardErrorMsg.java
index 8541e91..3d7d90f 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getauditview/_1/StandardErrorMsg.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.registerpcehr._2;
+package au.net.electronichealth.ns.mhr.svc.getauditview._1;
 
 import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/GetChangeHistoryViewPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/GetChangeHistoryViewPortType.java
similarity index 77%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/GetChangeHistoryViewPortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/GetChangeHistoryViewPortType.java
index 347070d..7c5e7cd 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/GetChangeHistoryViewPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/GetChangeHistoryViewPortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.svc.getchangehistoryview._1;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -9,11 +9,11 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1.GetChangeHistoryView;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1.GetChangeHistoryViewResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1.GetChangeHistoryView;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1.GetChangeHistoryViewResponse;
 
 
 /**
@@ -25,19 +25,19 @@
 @WebService(name = "GetChangeHistoryViewPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.rs._3.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface GetChangeHistoryViewPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -58,7 +58,7 @@ public void getChangeHistoryView(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/GetChangeHistoryViewService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/GetChangeHistoryViewService.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/GetChangeHistoryViewService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/GetChangeHistoryViewService.java
index 33c8846..d30a08e 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/GetChangeHistoryViewService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/GetChangeHistoryViewService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.svc.getchangehistoryview._1;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -26,7 +26,7 @@ public class GetChangeHistoryViewService
     private final static QName GETCHANGEHISTORYVIEWSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1", "getChangeHistoryViewService");
 
     static {
-        GETCHANGEHISTORYVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.getchangehistoryview._1.GetChangeHistoryViewService.class.getResource("wsdl/B2B_GetChangeHistoryView.wsdl");
+        GETCHANGEHISTORYVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.getchangehistoryview._1.GetChangeHistoryViewService.class.getResource("wsdl/B2B_GetChangeHistoryView.wsdl");
         WebServiceException e = null;
         if (GETCHANGEHISTORYVIEWSERVICE_WSDL_LOCATION == null) {
             e = new WebServiceException("Cannot find 'wsdl/B2B_GetChangeHistoryView.wsdl' wsdl. Place the resource correctly in the classpath.");
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/StandardErrorMsg.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/StandardErrorMsg.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/StandardErrorMsg.java
index e02a7b0..8d45184 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/b2b/svc/pcehrprofile/_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getchangehistoryview/_1/StandardErrorMsg.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.b2b.svc.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.svc.getchangehistoryview._1;
 
 import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewPortType.java
similarity index 78%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewPortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewPortType.java
index 6efda7f..3f9e9dd 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewPortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getindividualdetailsview._2;
+package au.net.electronichealth.ns.mhr.svc.getindividualdetailsview._2;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -9,10 +9,10 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2.GetIndividualDetailsViewResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2.GetIndividualDetailsViewResponse;
 
 
 /**
@@ -24,17 +24,17 @@
 @WebService(name = "GetIndividualDetailsViewPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface GetIndividualDetailsViewPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -55,7 +55,7 @@ public void getIndividualDetailsView(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewService.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewService.java
index a46bc21..f4c487d 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/GetIndividualDetailsViewService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getindividualdetailsview._2;
+package au.net.electronichealth.ns.mhr.svc.getindividualdetailsview._2;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -26,7 +26,7 @@ public class GetIndividualDetailsViewService
     private final static QName GETINDIVIDUALDETAILSVIEWSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0", "getIndividualDetailsViewService");
 
     static {
-        GETINDIVIDUALDETAILSVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.getindividualdetailsview._2.GetIndividualDetailsViewService.class.getResource("wsdl/B2B_GetIndividualDetailsView.wsdl");
+        GETINDIVIDUALDETAILSVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.getindividualdetailsview._2.GetIndividualDetailsViewService.class.getResource("wsdl/B2B_GetIndividualDetailsView.wsdl");
         WebServiceException e = null;
         if (GETINDIVIDUALDETAILSVIEWSERVICE_WSDL_LOCATION == null) {
             e = new WebServiceException("Cannot find 'wsdl/B2B_GetIndividualDetailsView.wsdl' wsdl. Place the resource correctly in the classpath.");
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/StandardErrorMsg.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/StandardErrorMsg.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/StandardErrorMsg.java
index 21894e3..1e67aa7 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getchangehistoryview/_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getindividualdetailsview/_2/StandardErrorMsg.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.svc.getindividualdetailsview._2;
 
 import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/GetRepresentativeListPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/GetRepresentativeListPortType.java
similarity index 78%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/GetRepresentativeListPortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/GetRepresentativeListPortType.java
index 247db0b..39bd843 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/GetRepresentativeListPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/GetRepresentativeListPortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getrepresentativelist._1;
+package au.net.electronichealth.ns.mhr.svc.getrepresentativelist._1;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -9,10 +9,10 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1.GetRepresentativeListResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1.GetRepresentativeListResponse;
 
 
 /**
@@ -24,17 +24,17 @@
 @WebService(name = "GetRepresentativeListPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface GetRepresentativeListPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -55,7 +55,7 @@ public void getRepresentativeList(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/GetRepresentativeListService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/GetRepresentativeListService.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/GetRepresentativeListService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/GetRepresentativeListService.java
index 937ec00..c4e8f52 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/GetRepresentativeListService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/GetRepresentativeListService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getrepresentativelist._1;
+package au.net.electronichealth.ns.mhr.svc.getrepresentativelist._1;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -26,7 +26,7 @@ public class GetRepresentativeListService
     private final static QName GETREPRESENTATIVELISTSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1", "getRepresentativeListService");
 
     static {
-        GETREPRESENTATIVELISTSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.getrepresentativelist._1.GetRepresentativeListService.class.getResource("wsdl/B2B_GetRepresentativeList.wsdl");
+        GETREPRESENTATIVELISTSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.getrepresentativelist._1.GetRepresentativeListService.class.getResource("wsdl/B2B_GetRepresentativeList.wsdl");
         WebServiceException e = null;
         if (GETREPRESENTATIVELISTSERVICE_WSDL_LOCATION == null) {
             e = new WebServiceException("Cannot find 'wsdl/B2B_GetRepresentativeList.wsdl' wsdl. Place the resource correctly in the classpath.");
diff --git a/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/StandardErrorMsg.java
new file mode 100644
index 0000000..b361f0d
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getrepresentativelist/_1/StandardErrorMsg.java
@@ -0,0 +1,54 @@
+
+package au.net.electronichealth.ns.mhr.svc.getrepresentativelist._1;
+
+import javax.xml.ws.WebFault;
+import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.8
+ * Generated source version: 2.2
+ * 
+ */
+@WebFault(name = "standardError", targetNamespace = "http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private StandardError faultInfo;
+
+    /**
+     * 
+     * @param message exception message
+     * @param faultInfo SOAP fault detail
+     */
+    public StandardErrorMsg(String message, StandardError faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param message exception message
+     * @param faultInfo SOAP fault detail
+     * @param cause underlying cause
+     */
+    public StandardErrorMsg(String message, StandardError faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return SOAP fault detail bean: au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError
+     */
+    public StandardError getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/GetViewPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/GetViewPortType.java
similarity index 61%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/GetViewPortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/GetViewPortType.java
index 02da05f..dc7ef12 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/GetViewPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/GetViewPortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getview._1;
+package au.net.electronichealth.ns.mhr.svc.getview._1;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -9,11 +9,11 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1.GetView;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1.GetViewResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1.GetView;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1.GetViewResponse;
 
 
 /**
@@ -25,25 +25,25 @@
 @WebService(name = "GetViewPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.healthcheckscheduleview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.medicareoverview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.observationview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.prescriptionanddispenseview._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.healthcheckscheduleview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.medicareoverview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.observationview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.prescriptionanddispenseview._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface GetViewPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -64,7 +64,7 @@ public void getView(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/GetViewService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/GetViewService.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/GetViewService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/GetViewService.java
index 03db2c1..8374b29 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/GetViewService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/GetViewService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getview._1;
+package au.net.electronichealth.ns.mhr.svc.getview._1;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -26,7 +26,7 @@ public class GetViewService
     private final static QName GETVIEWSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0", "getViewService");
 
     static {
-        GETVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.getview._1.GetViewService.class.getResource("wsdl/B2B_GetView.wsdl");
+        GETVIEWSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.getview._1.GetViewService.class.getResource("wsdl/B2B_GetView.wsdl");
         WebServiceException e = null;
         if (GETVIEWSERVICE_WSDL_LOCATION == null) {
             e = new WebServiceException("Cannot find 'wsdl/B2B_GetView.wsdl' wsdl. Place the resource correctly in the classpath.");
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/StandardErrorMsg.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/StandardErrorMsg.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/StandardErrorMsg.java
index ace261c..7ca0c30 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getview/_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/getview/_1/StandardErrorMsg.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.getview._1;
+package au.net.electronichealth.ns.mhr.svc.getview._1;
 
 import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
diff --git a/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/RegisterMHRPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/RegisterMHRPortType.java
new file mode 100644
index 0000000..77c455a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/RegisterMHRPortType.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.mhr.svc.registermhr._2;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.Action;
+import javax.xml.ws.FaultAction;
+import javax.xml.ws.Holder;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2.RegisterMHR;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2.RegisterMHRResponse;
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.8
+ * Generated source version: 2.2
+ * 
+ */
+@WebService(name = "RegisterPCEHRPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+        au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+        au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2.ObjectFactory.class,
+        au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
+        mhr_override.org.w3.ObjectFactory.class
+})
+public interface RegisterMHRPortType {
+
+    /**
+     * 
+     * @param mhrHeader       MHR request header
+     * @param parameters0     SOAP response holder
+     * @param timestampHeader timestamp SOAP header
+     * @param parameters      request payload
+     * @param signatureHeader signature SOAP header holder
+     * @throws StandardErrorMsg if the service returns a StandardErrorMsg fault
+     */
+    @WebMethod(operationName = "registerPCEHR")
+    @Action(input = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0/RegisterPCEHRPortType/registerPCEHRRequest", output = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0/RegisterPCEHRPortType/registerPCEHRResponse", fault = {
+            @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0/RegisterPCEHRPortType/Fault/standardError")
+    })
+    public void registerMHR(
+            @WebParam(name = "registerPCEHR", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0", partName = "parameters") RegisterMHR parameters,
+            @WebParam(name = "registerPCEHRResponse", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0", mode = WebParam.Mode.OUT, partName = "parameters") Holder<RegisterMHRResponse> parameters0,
+            @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "timestampHeader") Timestamp timestampHeader,
+            @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader") Holder<Signature> signatureHeader,
+            @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader") MHRHeader mhrHeader)
+            throws StandardErrorMsg;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/RegisterMHRService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/RegisterMHRService.java
new file mode 100644
index 0000000..46bc3ac
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/RegisterMHRService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.mhr.svc.registermhr._2;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.8
+ * Generated source version: 2.2
+ * 
+ */
+@WebServiceClient(name = "registerPCEHRService", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", wsdlLocation = "wsdl/B2B_RegisterMHR.wsdl")
+public class RegisterMHRService
+    extends Service
+{
+
+    private final static URL REGISTERMHRSERVICE_WSDL_LOCATION;
+    private final static WebServiceException REGISTERMHRSERVICE_EXCEPTION;
+    private final static QName REGISTERMHRSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", "registerPCEHRService");
+
+    static {
+        REGISTERMHRSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.registermhr._2.RegisterMHRService.class.getResource("wsdl/B2B_RegisterMHR.wsdl");
+        WebServiceException e = null;
+        if (REGISTERMHRSERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'wsdl/B2B_RegisterMHR.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        REGISTERMHRSERVICE_EXCEPTION = e;
+    }
+
+    public RegisterMHRService() {
+        super(__getWsdlLocation(), REGISTERMHRSERVICE_QNAME);
+    }
+
+    public RegisterMHRService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), REGISTERMHRSERVICE_QNAME, features);
+    }
+
+    public RegisterMHRService(URL wsdlLocation) {
+        super(wsdlLocation, REGISTERMHRSERVICE_QNAME);
+    }
+
+    public RegisterMHRService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, REGISTERMHRSERVICE_QNAME, features);
+    }
+
+    public RegisterMHRService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public RegisterMHRService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return the result
+     *     returns RegisterMHRPortType
+     */
+    @WebEndpoint(name = "registerPCEHRSOAP12Port")
+    public RegisterMHRPortType getRegisterMHRSOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", "registerPCEHRSOAP12Port"), RegisterMHRPortType.class);
+    }
+
+    /**
+     * 
+     * @param features web service features
+     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return the result
+     *     returns RegisterMHRPortType
+     */
+    @WebEndpoint(name = "registerPCEHRSOAP12Port")
+    public RegisterMHRPortType getRegisterMHRSOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", "registerPCEHRSOAP12Port"), RegisterMHRPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (REGISTERMHRSERVICE_EXCEPTION!= null) {
+            throw REGISTERMHRSERVICE_EXCEPTION;
+        }
+        return REGISTERMHRSERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/StandardErrorMsg.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/StandardErrorMsg.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/StandardErrorMsg.java
index bcd049d..cc8b81b 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/registermhr/_2/StandardErrorMsg.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.removedocument._1;
+package au.net.electronichealth.ns.mhr.svc.registermhr._2;
 
 import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/RemoveDocumentPortType.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/RemoveDocumentPortType.java
similarity index 76%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/RemoveDocumentPortType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/RemoveDocumentPortType.java
index 5151c15..2df52bb 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/RemoveDocumentPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/RemoveDocumentPortType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.removedocument._1;
+package au.net.electronichealth.ns.mhr.svc.removedocument._1;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -9,11 +9,11 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1.RemoveDocument;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1.RemoveDocumentResponse;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1.RemoveDocument;
+import au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1.RemoveDocumentResponse;
 
 
 /**
@@ -25,17 +25,17 @@
 @WebService(name = "RemoveDocumentPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface RemoveDocumentPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -56,7 +56,7 @@ public void removeDocument(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/RemoveDocumentService.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/RemoveDocumentService.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/RemoveDocumentService.java
rename to src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/RemoveDocumentService.java
index 1feef13..142bb99 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/removedocument/_1/RemoveDocumentService.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/RemoveDocumentService.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.svc.removedocument._1;
+package au.net.electronichealth.ns.mhr.svc.removedocument._1;
 
 import java.net.URL;
 import javax.xml.namespace.QName;
@@ -26,7 +26,7 @@ public class RemoveDocumentService
     private final static QName REMOVEDOCUMENTSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1", "removeDocumentService");
 
     static {
-        REMOVEDOCUMENTSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.removedocument._1.RemoveDocumentService.class.getResource("wsdl/B2B_RemoveDocument.wsdl");
+        REMOVEDOCUMENTSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.mhr.svc.removedocument._1.RemoveDocumentService.class.getResource("wsdl/B2B_RemoveDocument.wsdl");
         WebServiceException e = null;
         if (REMOVEDOCUMENTSERVICE_WSDL_LOCATION == null) {
             e = new WebServiceException("Cannot find 'wsdl/B2B_RemoveDocument.wsdl' wsdl. Place the resource correctly in the classpath.");
diff --git a/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/StandardErrorMsg.java
new file mode 100644
index 0000000..3ccff8c
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/mhr/svc/removedocument/_1/StandardErrorMsg.java
@@ -0,0 +1,54 @@
+
+package au.net.electronichealth.ns.mhr.svc.removedocument._1;
+
+import javax.xml.ws.WebFault;
+import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.2.8
+ * Generated source version: 2.2
+ * 
+ */
+@WebFault(name = "standardError", targetNamespace = "http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private StandardError faultInfo;
+
+    /**
+     * 
+     * @param message exception message
+     * @param faultInfo SOAP fault detail
+     */
+    public StandardErrorMsg(String message, StandardError faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param message exception message
+     * @param faultInfo SOAP fault detail
+     * @param cause underlying cause
+     */
+    public StandardErrorMsg(String message, StandardError faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return SOAP fault detail bean: au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError
+     */
+    public StandardError getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AccessConditionsType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AccessConditionsType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AccessConditionsType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AccessConditionsType.java
index 2bcf466..4cd79fc 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AccessConditionsType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AccessConditionsType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AccessedEntityType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AccessedEntityType.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AccessedEntityType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AccessedEntityType.java
index ba6c479..aa8312e 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AccessedEntityType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AccessedEntityType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AddressType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AddressType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AddressType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AddressType.java
index 7906482..5b2dec5 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AddressType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AddressTypeSupp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AddressTypeSupp.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AddressTypeSupp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AddressTypeSupp.java
index 6bbd775..ac2bec2 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AddressTypeSupp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AddressTypeSupp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AustralianPostalAddressType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AustralianPostalAddressType.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AustralianPostalAddressType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AustralianPostalAddressType.java
index d5f61c4..f265709 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AustralianPostalAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AustralianPostalAddressType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AustralianStreetAddressType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AustralianStreetAddressType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AustralianStreetAddressType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AustralianStreetAddressType.java
index 06b9cb2..592069c 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/AustralianStreetAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/AustralianStreetAddressType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ContactDetailsType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ContactDetailsType.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ContactDetailsType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ContactDetailsType.java
index 957dbc1..34e469e 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ContactDetailsType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ContactDetailsType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ContactPersonTypeSupp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ContactPersonTypeSupp.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ContactPersonTypeSupp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ContactPersonTypeSupp.java
index 905798d..5ed34a6 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ContactPersonTypeSupp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ContactPersonTypeSupp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType.java
index 883274a..be48f43 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType2.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType2.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType2.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType2.java
index ca81f9e..c05b4dc 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType2.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/DateAccuracyIndicatorType2.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/IDType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/IDType.java
similarity index 91%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/IDType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/IDType.java
index 1883f26..af4679f 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/IDType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/IDType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/IndividualTypeSupp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/IndividualTypeSupp.java
similarity index 88%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/IndividualTypeSupp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/IndividualTypeSupp.java
index e802121..337eb82 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/IndividualTypeSupp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/IndividualTypeSupp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -40,9 +40,9 @@
     "dateOfBirth"
 })
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2.RegisterPCEHRResponse.Individual.Demographics.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2.RegisterPCEHR.Representative.Demographics.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2.RegisterPCEHR.Individual.Demographics.class
+    au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2.RegisterMHRResponse.Individual.Demographics.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2.RegisterMHR.Representative.Demographics.class,
+    au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2.RegisterMHR.Individual.Demographics.class
 })
 public class IndividualTypeSupp {
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/LevelGroupType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/LevelGroupType.java
similarity index 96%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/LevelGroupType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/LevelGroupType.java
index 169ee16..b6283da 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/LevelGroupType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/LevelGroupType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/LevelType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/LevelType.java
similarity index 96%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/LevelType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/LevelType.java
index fb37d31..4671b43 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/LevelType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/LevelType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PCEHRHeader.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/MHRHeader.java
similarity index 92%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PCEHRHeader.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/MHRHeader.java
index de2a813..655274d 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PCEHRHeader.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/MHRHeader.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -102,26 +102,26 @@
     "accessingOrganisation"
 })
 @XmlRootElement(name = "PCEHRHeader")
-public class PCEHRHeader {
+public class MHRHeader {
 
     @XmlElement(name = "User", required = true)
-    protected PCEHRHeader.User user;
+    protected MHRHeader.User user;
     protected String ihiNumber;
     @XmlElement(required = true)
-    protected PCEHRHeader.ProductType productType;
+    protected MHRHeader.ProductType productType;
     @XmlElement(required = true)
-    protected PCEHRHeader.ClientSystemType clientSystemType;
-    protected PCEHRHeader.AccessingOrganisation accessingOrganisation;
+    protected MHRHeader.ClientSystemType clientSystemType;
+    protected MHRHeader.AccessingOrganisation accessingOrganisation;
 
     /**
      * Gets the value of the user property.
      * 
      * @return the result
      *     possible object is
-     *     {@link PCEHRHeader.User }
+     *     {@link MHRHeader.User }
      *     
      */
-    public PCEHRHeader.User getUser() {
+    public MHRHeader.User getUser() {
         return user;
     }
 
@@ -130,10 +130,10 @@ public PCEHRHeader.User getUser() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link PCEHRHeader.User }
+     *     {@link MHRHeader.User }
      *     
      */
-    public void setUser(PCEHRHeader.User value) {
+    public void setUser(MHRHeader.User value) {
         this.user = value;
     }
 
@@ -166,10 +166,10 @@ public void setIhiNumber(String value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link PCEHRHeader.ProductType }
+     *     {@link MHRHeader.ProductType }
      *     
      */
-    public PCEHRHeader.ProductType getProductType() {
+    public MHRHeader.ProductType getProductType() {
         return productType;
     }
 
@@ -178,10 +178,10 @@ public PCEHRHeader.ProductType getProductType() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link PCEHRHeader.ProductType }
+     *     {@link MHRHeader.ProductType }
      *     
      */
-    public void setProductType(PCEHRHeader.ProductType value) {
+    public void setProductType(MHRHeader.ProductType value) {
         this.productType = value;
     }
 
@@ -190,10 +190,10 @@ public void setProductType(PCEHRHeader.ProductType value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link PCEHRHeader.ClientSystemType }
+     *     {@link MHRHeader.ClientSystemType }
      *     
      */
-    public PCEHRHeader.ClientSystemType getClientSystemType() {
+    public MHRHeader.ClientSystemType getClientSystemType() {
         return clientSystemType;
     }
 
@@ -202,10 +202,10 @@ public PCEHRHeader.ClientSystemType getClientSystemType() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link PCEHRHeader.ClientSystemType }
+     *     {@link MHRHeader.ClientSystemType }
      *     
      */
-    public void setClientSystemType(PCEHRHeader.ClientSystemType value) {
+    public void setClientSystemType(MHRHeader.ClientSystemType value) {
         this.clientSystemType = value;
     }
 
@@ -214,10 +214,10 @@ public void setClientSystemType(PCEHRHeader.ClientSystemType value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link PCEHRHeader.AccessingOrganisation }
+     *     {@link MHRHeader.AccessingOrganisation }
      *     
      */
-    public PCEHRHeader.AccessingOrganisation getAccessingOrganisation() {
+    public MHRHeader.AccessingOrganisation getAccessingOrganisation() {
         return accessingOrganisation;
     }
 
@@ -226,10 +226,10 @@ public PCEHRHeader.AccessingOrganisation getAccessingOrganisation() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link PCEHRHeader.AccessingOrganisation }
+     *     {@link MHRHeader.AccessingOrganisation }
      *     
      */
-    public void setAccessingOrganisation(PCEHRHeader.AccessingOrganisation value) {
+    public void setAccessingOrganisation(MHRHeader.AccessingOrganisation value) {
         this.accessingOrganisation = value;
     }
 
@@ -388,8 +388,8 @@ public String value() {
             return value;
         }
 
-        public static PCEHRHeader.ClientSystemType fromValue(String v) {
-            for (PCEHRHeader.ClientSystemType c: PCEHRHeader.ClientSystemType.values()) {
+        public static MHRHeader.ClientSystemType fromValue(String v) {
+            for (MHRHeader.ClientSystemType c: MHRHeader.ClientSystemType.values()) {
                 if (c.value.equals(v)) {
                     return c;
                 }
@@ -581,7 +581,7 @@ public void setPlatform(String value) {
     public static class User {
 
         @XmlElement(name = "IDType", required = true)
-        protected PCEHRHeader.User.IDType idType;
+        protected MHRHeader.User.IDType idType;
         @XmlElement(name = "ID", required = true)
         protected String id;
         protected String role;
@@ -594,10 +594,10 @@ public static class User {
          * 
          * @return the result
          *     possible object is
-         *     {@link PCEHRHeader.User.IDType }
+         *     {@link MHRHeader.User.IDType }
          *     
          */
-        public PCEHRHeader.User.IDType getIDType() {
+        public MHRHeader.User.IDType getIDType() {
             return idType;
         }
 
@@ -606,10 +606,10 @@ public PCEHRHeader.User.IDType getIDType() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link PCEHRHeader.User.IDType }
+         *     {@link MHRHeader.User.IDType }
          *     
          */
-        public void setIDType(PCEHRHeader.User.IDType value) {
+        public void setIDType(MHRHeader.User.IDType value) {
             this.idType = value;
         }
 
@@ -738,8 +738,8 @@ public String value() {
                 return value;
             }
 
-            public static PCEHRHeader.User.IDType fromValue(String v) {
-                for (PCEHRHeader.User.IDType c: PCEHRHeader.User.IDType.values()) {
+            public static MHRHeader.User.IDType fromValue(String v) {
+                for (MHRHeader.User.IDType c: MHRHeader.User.IDType.values()) {
                     if (c.value.equals(v)) {
                         return c;
                     }
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PCEHRMobileHeader.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/MHRMobileHeader.java
similarity index 93%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PCEHRMobileHeader.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/MHRMobileHeader.java
index 745efb0..7ccc036 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PCEHRMobileHeader.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/MHRMobileHeader.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -31,7 +31,7 @@
     "ihiNumber"
 })
 @XmlRootElement(name = "PCEHRMobileHeader")
-public class PCEHRMobileHeader {
+public class MHRMobileHeader {
 
     protected String ihiNumber;
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameSuffix.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameSuffix.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameSuffix.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameSuffix.java
index 0c74231..0904bae 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameSuffix.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameSuffix.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameType.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameType.java
index d22a210..11ba9ac 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameTypeSupp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameTypeSupp.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameTypeSupp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameTypeSupp.java
index d0dbd35..c68be1d 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/NameTypeSupp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/NameTypeSupp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ObjectFactory.java
similarity index 90%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ObjectFactory.java
index dff1f8c..60369cf 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
@@ -12,7 +12,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -35,19 +35,19 @@ public class ObjectFactory {
     private final static QName _MilitaryHealthNumber_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", "militaryHealthNumber");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1
      * 
      */
     public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link PCEHRHeader }
+     * Create an instance of {@link MHRHeader }
      * 
      * @return newly created instance
      */
-    public PCEHRHeader createPCEHRHeader() {
-        return new PCEHRHeader();
+    public MHRHeader createMHRHeader() {
+        return new MHRHeader();
     }
 
     /**
@@ -96,12 +96,12 @@ public ParticipantActionType createParticipantActionType() {
     }
 
     /**
-     * Create an instance of {@link PCEHRHeader.User }
+     * Create an instance of {@link MHRHeader.User }
      * 
      * @return newly created instance
      */
-    public PCEHRHeader.User createPCEHRHeaderUser() {
-        return new PCEHRHeader.User();
+    public MHRHeader.User createMHRHeaderUser() {
+        return new MHRHeader.User();
     }
 
     /**
@@ -114,21 +114,21 @@ public OrganisationType createOrganisationType() {
     }
 
     /**
-     * Create an instance of {@link PCEHRHeader.ProductType }
+     * Create an instance of {@link MHRHeader.ProductType }
      * 
      * @return newly created instance
      */
-    public PCEHRHeader.ProductType createPCEHRHeaderProductType() {
-        return new PCEHRHeader.ProductType();
+    public MHRHeader.ProductType createMHRHeaderProductType() {
+        return new MHRHeader.ProductType();
     }
 
     /**
-     * Create an instance of {@link PCEHRHeader.AccessingOrganisation }
+     * Create an instance of {@link MHRHeader.AccessingOrganisation }
      * 
      * @return newly created instance
      */
-    public PCEHRHeader.AccessingOrganisation createPCEHRHeaderAccessingOrganisation() {
-        return new PCEHRHeader.AccessingOrganisation();
+    public MHRHeader.AccessingOrganisation createMHRHeaderAccessingOrganisation() {
+        return new MHRHeader.AccessingOrganisation();
     }
 
     /**
@@ -141,12 +141,12 @@ public Timestamp createTimestamp() {
     }
 
     /**
-     * Create an instance of {@link PCEHRMobileHeader }
+     * Create an instance of {@link MHRMobileHeader }
      * 
      * @return newly created instance
      */
-    public PCEHRMobileHeader createPCEHRMobileHeader() {
-        return new PCEHRMobileHeader();
+    public MHRMobileHeader createMHRMobileHeader() {
+        return new MHRMobileHeader();
     }
 
     /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationServiceType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationServiceType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationServiceType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationServiceType.java
index b35706b..88e84b2 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationServiceType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationServiceType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationType.java
index 8ab0233..7b43f67 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationTypeSupp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationTypeSupp.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationTypeSupp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationTypeSupp.java
index 79ca9a5..4a747c1 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/OrganisationTypeSupp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/OrganisationTypeSupp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ParticipantActionType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ParticipantActionType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ParticipantActionType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ParticipantActionType.java
index fd6b4c5..85d9c75 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ParticipantActionType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ParticipantActionType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ParticipantDetailsType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ParticipantDetailsType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ParticipantDetailsType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ParticipantDetailsType.java
index ccbf058..65800f8 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ParticipantDetailsType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ParticipantDetailsType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PostalDeliveryGroupType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/PostalDeliveryGroupType.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PostalDeliveryGroupType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/PostalDeliveryGroupType.java
index 9362c0b..8de4ebd 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PostalDeliveryGroupType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/PostalDeliveryGroupType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PostalDeliveryType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/PostalDeliveryType.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PostalDeliveryType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/PostalDeliveryType.java
index 2c36e77..793208d 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/PostalDeliveryType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/PostalDeliveryType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Preferred.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Preferred.java
similarity index 93%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Preferred.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Preferred.java
index a18545f..f0e611a 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Preferred.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Preferred.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/RecordStatusType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/RecordStatusType.java
similarity index 93%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/RecordStatusType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/RecordStatusType.java
index a646d90..202df55 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/RecordStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/RecordStatusType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/RecordStatusTypeSupp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/RecordStatusTypeSupp.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/RecordStatusTypeSupp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/RecordStatusTypeSupp.java
index 3296bcc..ac021f7 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/RecordStatusTypeSupp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/RecordStatusTypeSupp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ResponseStatusType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ResponseStatusType.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ResponseStatusType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ResponseStatusType.java
index 6fef529..28d377f 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/ResponseStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/ResponseStatusType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Sex.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Sex.java
similarity index 90%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Sex.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Sex.java
index 1958106..7892bb0 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Sex.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Sex.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Signature.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Signature.java
similarity index 79%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Signature.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Signature.java
index 9ec92a9..525d0b5 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Signature.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Signature.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -35,17 +35,17 @@
 public class Signature {
 
     @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#", required = true)
-    protected pcehr_override.org.w3.Signature signature;
+    protected mhr_override.org.w3.Signature signature;
 
     /**
      * Gets the value of the signature property.
      * 
      * @return the result
      *     possible object is
-     *     {@link pcehr_override.org.w3.Signature }
+     *     {@link mhr_override.org.w3.Signature }
      *     
      */
-    public pcehr_override.org.w3.Signature getSignature() {
+    public mhr_override.org.w3.Signature getSignature() {
         return signature;
     }
 
@@ -54,10 +54,10 @@ public pcehr_override.org.w3.Signature getSignature() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link pcehr_override.org.w3.Signature }
+     *     {@link mhr_override.org.w3.Signature }
      *     
      */
-    public void setSignature(pcehr_override.org.w3.Signature value) {
+    public void setSignature(mhr_override.org.w3.Signature value) {
         this.signature = value;
     }
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StateType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StateType.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StateType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StateType.java
index b8adf33..0a206a7 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StateType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StateType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StatusType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StatusType.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StatusType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StatusType.java
index adcb976..3fc62ac 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StatusType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StreetSuffixType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StreetSuffixType.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StreetSuffixType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StreetSuffixType.java
index a688736..bf73eb8 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StreetSuffixType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StreetSuffixType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StreetType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StreetType.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StreetType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StreetType.java
index 90c1f23..103430b 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/StreetType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/StreetType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Timestamp.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Timestamp.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Timestamp.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Timestamp.java
index 48557ef..79fe567 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Timestamp.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Timestamp.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/UnitGroupType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/UnitGroupType.java
similarity index 96%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/UnitGroupType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/UnitGroupType.java
index f403508..6d925ef 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/UnitGroupType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/UnitGroupType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/UnitType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/UnitType.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/UnitType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/UnitType.java
index 32923f7..6bfac85 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/UnitType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/UnitType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Usage.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Usage.java
similarity index 92%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Usage.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Usage.java
index f2c5e24..bd666dd 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/Usage.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/Usage.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/package-info.java
similarity index 72%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/package-info.java
index 2a49630..cf9acc3 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/common/commoncoreelements/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/common/commoncoreelements/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1;
+package au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportView.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportView.java
index 6538d48..4d7b8f4 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportViewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportViewResponse.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportViewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportViewResponse.java
index 00bf352..5c0a6c3 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportViewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/DiagnosticImagingReportViewResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -12,11 +12,11 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import au.gov.nehta.schema.DateAdapter;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.CodedType;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.DiagnosticReportInformationDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.ProviderInformationDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.RequesterInformationDT;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.CodedType;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.DiagnosticReportInformationDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.ProviderInformationDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.RequesterInformationDT;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/ObjectFactory.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/ObjectFactory.java
index ec744db..605bb33 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/package-info.java
similarity index 70%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/package-info.java
index 0875457..5ea1e6c 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/diagnosticimagingreportview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/diagnosticimagingreportview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.diagnosticimagingreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.diagnosticimagingreportview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/GetAuditView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/GetAuditView.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/GetAuditView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/GetAuditView.java
index 7e5d738..d7bf540 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/GetAuditView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/GetAuditView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/GetAuditViewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/GetAuditViewResponse.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/GetAuditViewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/GetAuditViewResponse.java
index 4df883d..08cf3e1 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/GetAuditViewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/GetAuditViewResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,11 +11,11 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.AccessConditionsType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.AccessedEntityType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ParticipantActionType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ParticipantDetailsType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.AccessConditionsType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.AccessedEntityType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ParticipantActionType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ParticipantDetailsType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/ObjectFactory.java
similarity index 92%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/ObjectFactory.java
index 63cb2fa..73c5318 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/package-info.java
similarity index 72%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/package-info.java
index 2ac0fbe..9fa5eb1 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getauditview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getauditview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getauditview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getauditview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryView.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryView.java
index fa62752..4593ce4 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryViewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryViewResponse.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryViewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryViewResponse.java
index 0f6477b..0c26575 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryViewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/GetChangeHistoryViewResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/ObjectFactory.java
similarity index 87%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/ObjectFactory.java
index 4163c3a..1590b11 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/package-info.java
similarity index 61%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/package-info.java
index 736c61a..92e3370 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getchangehistoryview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getchangehistoryview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0")
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/GetIndividualDetailsViewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/GetIndividualDetailsViewResponse.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/GetIndividualDetailsViewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/GetIndividualDetailsViewResponse.java
index e922ede..02e6d5d 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/GetIndividualDetailsViewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/GetIndividualDetailsViewResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,13 +8,13 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ContactDetailsType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ContactPersonTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.DateAccuracyIndicatorType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.RecordStatusType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.StatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ContactDetailsType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ContactPersonTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.RecordStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.StatusType;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/ObjectFactory.java
similarity index 91%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/ObjectFactory.java
index fe47d7c..d023a58 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
@@ -10,7 +10,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -27,7 +27,7 @@ public class ObjectFactory {
     private final static QName _GetIndividualDetailsView_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0", "getIndividualDetailsView");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/package-info.java
similarity index 70%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/package-info.java
index 27115e1..850a01f 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getindividualdetailsview/_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getindividualdetailsview/_2/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getindividualdetailsview._2;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getindividualdetailsview._2;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/GetRepresentativeListResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/GetRepresentativeListResponse.java
similarity index 90%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/GetRepresentativeListResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/GetRepresentativeListResponse.java
index 189b828..2dae211 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/GetRepresentativeListResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/GetRepresentativeListResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,9 +8,9 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.AddressTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.NameTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.AddressTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.NameTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 
 
 /**
@@ -87,7 +87,7 @@ public class GetRepresentativeListResponse {
     @XmlElement(required = true)
     protected ResponseStatusType responseStatus;
     @XmlElement(name = "PCEHRRecord")
-    protected GetRepresentativeListResponse.PCEHRRecord pcehrRecord;
+    protected GetRepresentativeListResponse.MHRRecord mhrRecord;
 
     /**
      * Gets the value of the responseStatus property.
@@ -114,27 +114,27 @@ public void setResponseStatus(ResponseStatusType value) {
     }
 
     /**
-     * Gets the value of the pcehrRecord property.
+     * Gets the value of the mhrRecord property.
      * 
      * @return the result
      *     possible object is
-     *     {@link GetRepresentativeListResponse.PCEHRRecord }
+     *     {@link GetRepresentativeListResponse.MHRRecord }
      *     
      */
-    public GetRepresentativeListResponse.PCEHRRecord getPCEHRRecord() {
-        return pcehrRecord;
+    public GetRepresentativeListResponse.MHRRecord getMHRRecord() {
+        return mhrRecord;
     }
 
     /**
-     * Sets the value of the pcehrRecord property.
+     * Sets the value of the mhrRecord property.
      * 
      * @param value field value
      *     allowed object is
-     *     {@link GetRepresentativeListResponse.PCEHRRecord }
+     *     {@link GetRepresentativeListResponse.MHRRecord }
      *     
      */
-    public void setPCEHRRecord(GetRepresentativeListResponse.PCEHRRecord value) {
-        this.pcehrRecord = value;
+    public void setMHRRecord(GetRepresentativeListResponse.MHRRecord value) {
+        this.mhrRecord = value;
     }
 
 
@@ -194,20 +194,20 @@ public void setPCEHRRecord(GetRepresentativeListResponse.PCEHRRecord value) {
     @XmlType(name = "", propOrder = {
         "representativeList"
     })
-    public static class PCEHRRecord {
+    public static class MHRRecord {
 
         @XmlElement(required = true)
-        protected GetRepresentativeListResponse.PCEHRRecord.RepresentativeList representativeList;
+        protected GetRepresentativeListResponse.MHRRecord.RepresentativeList representativeList;
 
         /**
          * Gets the value of the representativeList property.
          * 
          * @return the result
          *     possible object is
-         *     {@link GetRepresentativeListResponse.PCEHRRecord.RepresentativeList }
+         *     {@link GetRepresentativeListResponse.MHRRecord.RepresentativeList }
          *     
          */
-        public GetRepresentativeListResponse.PCEHRRecord.RepresentativeList getRepresentativeList() {
+        public GetRepresentativeListResponse.MHRRecord.RepresentativeList getRepresentativeList() {
             return representativeList;
         }
 
@@ -216,10 +216,10 @@ public GetRepresentativeListResponse.PCEHRRecord.RepresentativeList getRepresent
          * 
          * @param value field value
          *     allowed object is
-         *     {@link GetRepresentativeListResponse.PCEHRRecord.RepresentativeList }
+         *     {@link GetRepresentativeListResponse.MHRRecord.RepresentativeList }
          *     
          */
-        public void setRepresentativeList(GetRepresentativeListResponse.PCEHRRecord.RepresentativeList value) {
+        public void setRepresentativeList(GetRepresentativeListResponse.MHRRecord.RepresentativeList value) {
             this.representativeList = value;
         }
 
@@ -273,7 +273,7 @@ public void setRepresentativeList(GetRepresentativeListResponse.PCEHRRecord.Repr
         public static class RepresentativeList {
 
             @XmlElement(name = "representative", required = true)
-            protected List<GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative> representatives;
+            protected List<GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative> representatives;
 
             /**
              * Gets the value of the representatives property.
@@ -290,14 +290,14 @@ public static class RepresentativeList {
              * 
              * 
              * <p>Objects of the following type(s) are allowed in the list
-             * {@link GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative }
+             * {@link GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative }
              * 
              * 
              * @return field value
              */
-            public List<GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative> getRepresentatives() {
+            public List<GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative> getRepresentatives() {
                 if (representatives == null) {
-                    representatives = new ArrayList<GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative>();
+                    representatives = new ArrayList<GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative>();
                 }
                 return this.representatives;
             }
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/ObjectFactory.java
similarity index 69%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/ObjectFactory.java
index 9610567..b91dd5c 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
@@ -10,7 +10,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -27,7 +27,7 @@ public class ObjectFactory {
     private final static QName _GetRepresentativeList_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1", "getRepresentativeList");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1
      * 
      */
     public ObjectFactory() {
@@ -43,30 +43,30 @@ public GetRepresentativeListResponse createGetRepresentativeListResponse() {
     }
 
     /**
-     * Create an instance of {@link GetRepresentativeListResponse.PCEHRRecord }
+     * Create an instance of {@link GetRepresentativeListResponse.MHRRecord }
      * 
      * @return newly created instance
      */
-    public GetRepresentativeListResponse.PCEHRRecord createGetRepresentativeListResponsePCEHRRecord() {
-        return new GetRepresentativeListResponse.PCEHRRecord();
+    public GetRepresentativeListResponse.MHRRecord createGetRepresentativeListResponseMHRRecord() {
+        return new GetRepresentativeListResponse.MHRRecord();
     }
 
     /**
-     * Create an instance of {@link GetRepresentativeListResponse.PCEHRRecord.RepresentativeList }
+     * Create an instance of {@link GetRepresentativeListResponse.MHRRecord.RepresentativeList }
      * 
      * @return newly created instance
      */
-    public GetRepresentativeListResponse.PCEHRRecord.RepresentativeList createGetRepresentativeListResponsePCEHRRecordRepresentativeList() {
-        return new GetRepresentativeListResponse.PCEHRRecord.RepresentativeList();
+    public GetRepresentativeListResponse.MHRRecord.RepresentativeList createGetRepresentativeListResponseMHRRecordRepresentativeList() {
+        return new GetRepresentativeListResponse.MHRRecord.RepresentativeList();
     }
 
     /**
-     * Create an instance of {@link GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative }
+     * Create an instance of {@link GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative }
      * 
      * @return newly created instance
      */
-    public GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative createGetRepresentativeListResponsePCEHRRecordRepresentativeListRepresentative() {
-        return new GetRepresentativeListResponse.PCEHRRecord.RepresentativeList.Representative();
+    public GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative createGetRepresentativeListResponseMHRRecordRepresentativeListRepresentative() {
+        return new GetRepresentativeListResponse.MHRRecord.RepresentativeList.Representative();
     }
 
     /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/package-info.java
similarity index 71%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/package-info.java
index 757556f..a5fa441 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getrepresentativelist/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getrepresentativelist/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getrepresentativelist._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getrepresentativelist._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/GetView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/GetView.java
similarity index 95%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/GetView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/GetView.java
index 213f175..d67898d 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/GetView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/GetView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/GetViewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/GetViewResponse.java
similarity index 96%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/GetViewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/GetViewResponse.java
index 639b2a5..04aa3ba 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/GetViewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/GetViewResponse.java
@@ -1,12 +1,12 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/ObjectFactory.java
similarity index 87%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/ObjectFactory.java
index 2543aa4..150d07e 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/package-info.java
similarity index 73%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/package-info.java
index 8ae93b7..34256f0 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/getview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/getview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.getview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.getview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/HealthCheckScheduleView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/HealthCheckScheduleView.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/HealthCheckScheduleView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/HealthCheckScheduleView.java
index 65b2ea2..81bbe1f 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/HealthCheckScheduleView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/HealthCheckScheduleView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthcheckscheduleview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthcheckscheduleview._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/ObjectFactory.java
similarity index 80%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/ObjectFactory.java
index 25c4e91..6014bd6 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthcheckscheduleview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthcheckscheduleview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.healthcheckscheduleview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.healthcheckscheduleview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.healthcheckscheduleview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.healthcheckscheduleview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/package-info.java
similarity index 70%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/package-info.java
index a84e742..bcba376 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthcheckscheduleview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthcheckscheduleview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthCheckScheduleView/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthcheckscheduleview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthcheckscheduleview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverView.java
similarity index 96%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverView.java
index 16f76f9..1fbaac2 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverviewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverviewResponse.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverviewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverviewResponse.java
index 08683a1..88341c4 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverviewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/HealthRecordOverviewResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,14 +9,14 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.AddressTypeDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.CodedType;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.ContactDetailsDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.DocumentDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.InformationAvailableDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.NameTypeDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.TimeStampDT;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.AddressTypeDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.CodedType;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.ContactDetailsDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.DocumentDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.InformationAvailableDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.NameTypeDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.TimeStampDT;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/ObjectFactory.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/ObjectFactory.java
index b1e75ec..cda9244 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/package-info.java
similarity index 71%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/package-info.java
index 2fa9a33..7a01283 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/healthrecordoverview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/healthrecordoverview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.healthrecordoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.healthrecordoverview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/MedicareOverview.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/MedicareOverview.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/MedicareOverview.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/MedicareOverview.java
index 6d3b892..5b496f2 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/MedicareOverview.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/MedicareOverview.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.medicareoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.medicareoverview._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/ObjectFactory.java
similarity index 81%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/ObjectFactory.java
index 0e00a6b..6c0f3b4 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.medicareoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.medicareoverview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.medicareoverview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.medicareoverview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.medicareoverview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.medicareoverview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/package-info.java
similarity index 71%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/package-info.java
index bac5f9a..9cfd0bb 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/medicareoverview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/medicareoverview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/MedicareOverview/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.medicareoverview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.medicareoverview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/DoesPCEHRExistResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/DoesMHRExistResponse.java
similarity index 83%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/DoesPCEHRExistResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/DoesMHRExistResponse.java
index fa96ffa..bd5a1f0 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/DoesPCEHRExistResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/DoesMHRExistResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -44,11 +44,11 @@
     "accessCodeRequired"
 })
 @XmlRootElement(name = "doesPCEHRExistResponse")
-public class DoesPCEHRExistResponse {
+public class DoesMHRExistResponse {
 
     @XmlElement(name = "PCEHRExists")
     protected boolean pcehrExists;
-    protected DoesPCEHRExistResponse.AccessCodeRequired accessCodeRequired;
+    protected DoesMHRExistResponse.AccessCodeRequired accessCodeRequired;
 
     /**
      * Gets the value of the pcehrExists property.
@@ -73,10 +73,10 @@ public void setPCEHRExists(boolean value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link DoesPCEHRExistResponse.AccessCodeRequired }
+     *     {@link DoesMHRExistResponse.AccessCodeRequired }
      *     
      */
-    public DoesPCEHRExistResponse.AccessCodeRequired getAccessCodeRequired() {
+    public DoesMHRExistResponse.AccessCodeRequired getAccessCodeRequired() {
         return accessCodeRequired;
     }
 
@@ -85,10 +85,10 @@ public DoesPCEHRExistResponse.AccessCodeRequired getAccessCodeRequired() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link DoesPCEHRExistResponse.AccessCodeRequired }
+     *     {@link DoesMHRExistResponse.AccessCodeRequired }
      *     
      */
-    public void setAccessCodeRequired(DoesPCEHRExistResponse.AccessCodeRequired value) {
+    public void setAccessCodeRequired(DoesMHRExistResponse.AccessCodeRequired value) {
         this.accessCodeRequired = value;
     }
 
@@ -128,8 +128,8 @@ public String value() {
             return value;
         }
 
-        public static DoesPCEHRExistResponse.AccessCodeRequired fromValue(String v) {
-            for (DoesPCEHRExistResponse.AccessCodeRequired c: DoesPCEHRExistResponse.AccessCodeRequired.values()) {
+        public static DoesMHRExistResponse.AccessCodeRequired fromValue(String v) {
+            for (DoesMHRExistResponse.AccessCodeRequired c: DoesMHRExistResponse.AccessCodeRequired.values()) {
                 if (c.value.equals(v)) {
                     return c;
                 }
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/GainPCEHRAccess.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/GainMHRAccess.java
similarity index 90%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/GainPCEHRAccess.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/GainMHRAccess.java
index cea2365..94fd453 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/GainPCEHRAccess.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/GainMHRAccess.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,8 +13,8 @@
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import au.gov.nehta.schema.DateAdapter;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.NameType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Sex;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.NameType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Sex;
 
 
 /**
@@ -86,33 +86,33 @@
     "pcehrRecord"
 })
 @XmlRootElement(name = "gainPCEHRAccess")
-public class GainPCEHRAccess {
+public class GainMHRAccess {
 
     @XmlElement(name = "PCEHRRecord", required = true)
-    protected GainPCEHRAccess.PCEHRRecord pcehrRecord;
+    protected GainMHRAccess.MHRRecord mhrRecord;
 
     /**
-     * Gets the value of the pcehrRecord property.
+     * Gets the value of the mhrRecord property.
      * 
      * @return the result
      *     possible object is
-     *     {@link GainPCEHRAccess.PCEHRRecord }
+     *     {@link GainMHRAccess.MHRRecord }
      *     
      */
-    public GainPCEHRAccess.PCEHRRecord getPCEHRRecord() {
-        return pcehrRecord;
+    public GainMHRAccess.MHRRecord getMHRRecord() {
+        return mhrRecord;
     }
 
     /**
-     * Sets the value of the pcehrRecord property.
+     * Sets the value of the mhrRecord property.
      * 
      * @param value field value
      *     allowed object is
-     *     {@link GainPCEHRAccess.PCEHRRecord }
+     *     {@link GainMHRAccess.MHRRecord }
      *     
      */
-    public void setPCEHRRecord(GainPCEHRAccess.PCEHRRecord value) {
-        this.pcehrRecord = value;
+    public void setMHRRecord(GainMHRAccess.MHRRecord value) {
+        this.mhrRecord = value;
     }
 
 
@@ -175,20 +175,20 @@ public void setPCEHRRecord(GainPCEHRAccess.PCEHRRecord value) {
         "authorisationDetails",
         "individual"
     })
-    public static class PCEHRRecord {
+    public static class MHRRecord {
 
-        protected GainPCEHRAccess.PCEHRRecord.AuthorisationDetails authorisationDetails;
-        protected GainPCEHRAccess.PCEHRRecord.Individual individual;
+        protected GainMHRAccess.MHRRecord.AuthorisationDetails authorisationDetails;
+        protected GainMHRAccess.MHRRecord.Individual individual;
 
         /**
          * Gets the value of the authorisationDetails property.
          * 
          * @return the result
          *     possible object is
-         *     {@link GainPCEHRAccess.PCEHRRecord.AuthorisationDetails }
+         *     {@link GainMHRAccess.MHRRecord.AuthorisationDetails }
          *     
          */
-        public GainPCEHRAccess.PCEHRRecord.AuthorisationDetails getAuthorisationDetails() {
+        public GainMHRAccess.MHRRecord.AuthorisationDetails getAuthorisationDetails() {
             return authorisationDetails;
         }
 
@@ -197,10 +197,10 @@ public GainPCEHRAccess.PCEHRRecord.AuthorisationDetails getAuthorisationDetails(
          * 
          * @param value field value
          *     allowed object is
-         *     {@link GainPCEHRAccess.PCEHRRecord.AuthorisationDetails }
+         *     {@link GainMHRAccess.MHRRecord.AuthorisationDetails }
          *     
          */
-        public void setAuthorisationDetails(GainPCEHRAccess.PCEHRRecord.AuthorisationDetails value) {
+        public void setAuthorisationDetails(GainMHRAccess.MHRRecord.AuthorisationDetails value) {
             this.authorisationDetails = value;
         }
 
@@ -209,10 +209,10 @@ public void setAuthorisationDetails(GainPCEHRAccess.PCEHRRecord.AuthorisationDet
          * 
          * @return the result
          *     possible object is
-         *     {@link GainPCEHRAccess.PCEHRRecord.Individual }
+         *     {@link GainMHRAccess.MHRRecord.Individual }
          *     
          */
-        public GainPCEHRAccess.PCEHRRecord.Individual getIndividual() {
+        public GainMHRAccess.MHRRecord.Individual getIndividual() {
             return individual;
         }
 
@@ -221,10 +221,10 @@ public GainPCEHRAccess.PCEHRRecord.Individual getIndividual() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link GainPCEHRAccess.PCEHRRecord.Individual }
+         *     {@link GainMHRAccess.MHRRecord.Individual }
          *     
          */
-        public void setIndividual(GainPCEHRAccess.PCEHRRecord.Individual value) {
+        public void setIndividual(GainMHRAccess.MHRRecord.Individual value) {
             this.individual = value;
         }
 
@@ -264,7 +264,7 @@ public void setIndividual(GainPCEHRAccess.PCEHRRecord.Individual value) {
         public static class AuthorisationDetails {
 
             @XmlElement(required = true)
-            protected GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType accessType;
+            protected GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType accessType;
             protected String accessCode;
 
             /**
@@ -272,10 +272,10 @@ public static class AuthorisationDetails {
              * 
              * @return the result
              *     possible object is
-             *     {@link GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType }
+             *     {@link GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType }
              *     
              */
-            public GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType getAccessType() {
+            public GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType getAccessType() {
                 return accessType;
             }
 
@@ -284,10 +284,10 @@ public GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType getAccessType
              * 
              * @param value field value
              *     allowed object is
-             *     {@link GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType }
+             *     {@link GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType }
              *     
              */
-            public void setAccessType(GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType value) {
+            public void setAccessType(GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType value) {
                 this.accessType = value;
             }
 
@@ -348,8 +348,8 @@ public String value() {
                     return value;
                 }
 
-                public static GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType fromValue(String v) {
-                    for (GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType c: GainPCEHRAccess.PCEHRRecord.AuthorisationDetails.AccessType.values()) {
+                public static GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType fromValue(String v) {
+                    for (GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType c: GainMHRAccess.MHRRecord.AuthorisationDetails.AccessType.values()) {
                         if (c.value.equals(v)) {
                             return c;
                         }
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/GainPCEHRAccessResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/GainMHRAccessResponse.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/GainPCEHRAccessResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/GainMHRAccessResponse.java
index 3664844..bae36fd 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/GainPCEHRAccessResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/GainMHRAccessResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -11,12 +11,12 @@
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import au.gov.nehta.schema.DateAdapter;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.DateAccuracyIndicatorType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.NameType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.RecordStatusType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Sex;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.StatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.NameType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.RecordStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Sex;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.StatusType;
 
 
 /**
@@ -65,11 +65,11 @@
     "individual"
 })
 @XmlRootElement(name = "gainPCEHRAccessResponse")
-public class GainPCEHRAccessResponse {
+public class GainMHRAccessResponse {
 
     @XmlElement(required = true)
     protected ResponseStatusType responseStatus;
-    protected GainPCEHRAccessResponse.Individual individual;
+    protected GainMHRAccessResponse.Individual individual;
 
     /**
      * Gets the value of the responseStatus property.
@@ -100,10 +100,10 @@ public void setResponseStatus(ResponseStatusType value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link GainPCEHRAccessResponse.Individual }
+     *     {@link GainMHRAccessResponse.Individual }
      *     
      */
-    public GainPCEHRAccessResponse.Individual getIndividual() {
+    public GainMHRAccessResponse.Individual getIndividual() {
         return individual;
     }
 
@@ -112,10 +112,10 @@ public GainPCEHRAccessResponse.Individual getIndividual() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link GainPCEHRAccessResponse.Individual }
+     *     {@link GainMHRAccessResponse.Individual }
      *     
      */
-    public void setIndividual(GainPCEHRAccessResponse.Individual value) {
+    public void setIndividual(GainMHRAccessResponse.Individual value) {
         this.individual = value;
     }
 
diff --git a/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/ObjectFactory.java
new file mode 100644
index 0000000..f303412
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/ObjectFactory.java
@@ -0,0 +1,110 @@
+
+package au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1 package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _DoesMHRExist_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", "doesPCEHRExist");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link DoesMHRExistResponse }
+     * 
+     * @return newly created instance
+     */
+    public DoesMHRExistResponse createDoesMHRExistResponse() {
+        return new DoesMHRExistResponse();
+    }
+
+    /**
+     * Create an instance of {@link GainMHRAccess }
+     * 
+     * @return newly created instance
+     */
+    public GainMHRAccess createGainMHRAccess() {
+        return new GainMHRAccess();
+    }
+
+    /**
+     * Create an instance of {@link GainMHRAccess.MHRRecord }
+     * 
+     * @return newly created instance
+     */
+    public GainMHRAccess.MHRRecord createGainMHRAccessMHRRecord() {
+        return new GainMHRAccess.MHRRecord();
+    }
+
+    /**
+     * Create an instance of {@link GainMHRAccess.MHRRecord.AuthorisationDetails }
+     * 
+     * @return newly created instance
+     */
+    public GainMHRAccess.MHRRecord.AuthorisationDetails createGainMHRAccessMHRRecordAuthorisationDetails() {
+        return new GainMHRAccess.MHRRecord.AuthorisationDetails();
+    }
+
+    /**
+     * Create an instance of {@link GainMHRAccessResponse }
+     * 
+     * @return newly created instance
+     */
+    public GainMHRAccessResponse createGainMHRAccessResponse() {
+        return new GainMHRAccessResponse();
+    }
+
+    /**
+     * Create an instance of {@link GainMHRAccessResponse.Individual }
+     * 
+     * @return newly created instance
+     */
+    public GainMHRAccessResponse.Individual createGainMHRAccessResponseIndividual() {
+        return new GainMHRAccessResponse.Individual();
+    }
+
+    /**
+     * Create an instance of {@link GainMHRAccess.MHRRecord.Individual }
+     * 
+     * @return newly created instance
+     */
+    public GainMHRAccess.MHRRecord.Individual createGainMHRAccessMHRRecordIndividual() {
+        return new GainMHRAccess.MHRRecord.Individual();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Object }&gt;}
+     * 
+     * @param value field value
+     * @return newly created instance
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", name = "doesPCEHRExist")
+    public JAXBElement<Object> createDoesMHRExist(Object value) {
+        return new JAXBElement<Object>(_DoesMHRExist_QNAME, Object.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/package-info.java
similarity index 72%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/package-info.java
index a872bad..080d179 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/mhrprofile/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.mhrprofile._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/ObjectFactory.java
similarity index 81%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/ObjectFactory.java
index 4b43256..024ddf5 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.observationview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.observationview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.observationview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.observationview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.observationview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.observationview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/ObservationView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/ObservationView.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/ObservationView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/ObservationView.java
index 6caeec5..4c558b4 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/ObservationView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/ObservationView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.observationview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.observationview._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/package-info.java
similarity index 71%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/package-info.java
index ce4d1ad..c604021 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/observationview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/observationview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/ObservationView/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.observationview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.observationview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/ObjectFactory.java
similarity index 92%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/ObjectFactory.java
index d276a63..2f401d6 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/PathologyReportView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/PathologyReportView.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/PathologyReportView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/PathologyReportView.java
index ce5d4bc..0318457 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/PathologyReportView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/PathologyReportView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/PathologyReportViewResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/PathologyReportViewResponse.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/PathologyReportViewResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/PathologyReportViewResponse.java
index ae9cb49..046aa8b 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/PathologyReportViewResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/PathologyReportViewResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -12,11 +12,11 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import au.gov.nehta.schema.DateAdapter;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.CodedType;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.PathologyReportInformationDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.ProviderInformationDT;
-import au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1.RequesterInformationDT;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.CodedType;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.PathologyReportInformationDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.ProviderInformationDT;
+import au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1.RequesterInformationDT;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/package-info.java
similarity index 71%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/package-info.java
index 2a9788a..fde4bd9 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pathologyreportview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/pathologyreportview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pathologyreportview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.pathologyreportview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/ObjectFactory.java
similarity index 80%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/ObjectFactory.java
index 1c6135e..9054f16 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.prescriptionanddispenseview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.prescriptionanddispenseview._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.prescriptionanddispenseview._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.prescriptionanddispenseview._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.prescriptionanddispenseview._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.prescriptionanddispenseview._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/PrescriptionAndDispenseView.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/PrescriptionAndDispenseView.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/PrescriptionAndDispenseView.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/PrescriptionAndDispenseView.java
index 1f10a51..1c6f842 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/PrescriptionAndDispenseView.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/PrescriptionAndDispenseView.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.prescriptionanddispenseview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.prescriptionanddispenseview._1;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/package-info.java
similarity index 70%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/package-info.java
index 3263f4c..488f702 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/prescriptionanddispenseview/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/prescriptionanddispenseview/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PrescriptionAndDispenseView/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.prescriptionanddispenseview._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.prescriptionanddispenseview._1;
diff --git a/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/ObjectFactory.java
new file mode 100644
index 0000000..9630a56
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/ObjectFactory.java
@@ -0,0 +1,167 @@
+
+package au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2 package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHRResponse }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHRResponse createRegisterMHRResponse() {
+        return new RegisterMHRResponse();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR createRegisterMHR() {
+        return new RegisterMHR();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Assertions }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Assertions createRegisterMHRAssertions() {
+        return new RegisterMHR.Assertions();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Assertions.DocumentConsent }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Assertions.DocumentConsent createRegisterMHRAssertionsDocumentConsent() {
+        return new RegisterMHR.Assertions.DocumentConsent();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Assertions.Identity }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Assertions.Identity createRegisterMHRAssertionsIdentity() {
+        return new RegisterMHR.Assertions.Identity();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Individual }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Individual createRegisterMHRIndividual() {
+        return new RegisterMHR.Individual();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Representative }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Representative createRegisterMHRRepresentative() {
+        return new RegisterMHR.Representative();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHRResponse.Individual }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHRResponse.Individual createRegisterMHRResponseIndividual() {
+        return new RegisterMHRResponse.Individual();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHRResponse.IvcDetails }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHRResponse.IvcDetails createRegisterMHRResponseIvcDetails() {
+        return new RegisterMHRResponse.IvcDetails();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Assertions.IvcCorrespondence }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Assertions.IvcCorrespondence createRegisterMHRAssertionsIvcCorrespondence() {
+        return new RegisterMHR.Assertions.IvcCorrespondence();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Assertions.DocumentConsent.Document }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Assertions.DocumentConsent.Document createRegisterMHRAssertionsDocumentConsentDocument() {
+        return new RegisterMHR.Assertions.DocumentConsent.Document();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Assertions.Identity.EvidenceOfIdentity }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Assertions.Identity.EvidenceOfIdentity createRegisterMHRAssertionsIdentityEvidenceOfIdentity() {
+        return new RegisterMHR.Assertions.Identity.EvidenceOfIdentity();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Individual.Demographics }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Individual.Demographics createRegisterMHRIndividualDemographics() {
+        return new RegisterMHR.Individual.Demographics();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHR.Representative.Demographics }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHR.Representative.Demographics createRegisterMHRRepresentativeDemographics() {
+        return new RegisterMHR.Representative.Demographics();
+    }
+
+    /**
+     * Create an instance of {@link RegisterMHRResponse.Individual.Demographics }
+     * 
+     * @return newly created instance
+     */
+    public RegisterMHRResponse.Individual.Demographics createRegisterMHRResponseIndividualDemographics() {
+        return new RegisterMHRResponse.Individual.Demographics();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/RegisterPCEHR.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/RegisterMHR.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/RegisterPCEHR.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/RegisterMHR.java
index 0189c27..0cd2e3c 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/RegisterPCEHR.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/RegisterMHR.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,8 +10,8 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ContactDetailsType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ContactDetailsType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
 
 
 /**
@@ -211,22 +211,22 @@
     "assertions"
 })
 @XmlRootElement(name = "registerPCEHR")
-public class RegisterPCEHR {
+public class RegisterMHR {
 
-    protected RegisterPCEHR.Representative representative;
-    protected RegisterPCEHR.Individual individual;
+    protected RegisterMHR.Representative representative;
+    protected RegisterMHR.Individual individual;
     @XmlElement(required = true)
-    protected RegisterPCEHR.Assertions assertions;
+    protected RegisterMHR.Assertions assertions;
 
     /**
      * Gets the value of the representative property.
      * 
      * @return the result
      *     possible object is
-     *     {@link RegisterPCEHR.Representative }
+     *     {@link RegisterMHR.Representative }
      *     
      */
-    public RegisterPCEHR.Representative getRepresentative() {
+    public RegisterMHR.Representative getRepresentative() {
         return representative;
     }
 
@@ -235,10 +235,10 @@ public RegisterPCEHR.Representative getRepresentative() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link RegisterPCEHR.Representative }
+     *     {@link RegisterMHR.Representative }
      *     
      */
-    public void setRepresentative(RegisterPCEHR.Representative value) {
+    public void setRepresentative(RegisterMHR.Representative value) {
         this.representative = value;
     }
 
@@ -247,10 +247,10 @@ public void setRepresentative(RegisterPCEHR.Representative value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link RegisterPCEHR.Individual }
+     *     {@link RegisterMHR.Individual }
      *     
      */
-    public RegisterPCEHR.Individual getIndividual() {
+    public RegisterMHR.Individual getIndividual() {
         return individual;
     }
 
@@ -259,10 +259,10 @@ public RegisterPCEHR.Individual getIndividual() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link RegisterPCEHR.Individual }
+     *     {@link RegisterMHR.Individual }
      *     
      */
-    public void setIndividual(RegisterPCEHR.Individual value) {
+    public void setIndividual(RegisterMHR.Individual value) {
         this.individual = value;
     }
 
@@ -271,10 +271,10 @@ public void setIndividual(RegisterPCEHR.Individual value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link RegisterPCEHR.Assertions }
+     *     {@link RegisterMHR.Assertions }
      *     
      */
-    public RegisterPCEHR.Assertions getAssertions() {
+    public RegisterMHR.Assertions getAssertions() {
         return assertions;
     }
 
@@ -283,10 +283,10 @@ public RegisterPCEHR.Assertions getAssertions() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link RegisterPCEHR.Assertions }
+     *     {@link RegisterMHR.Assertions }
      *     
      */
-    public void setAssertions(RegisterPCEHR.Assertions value) {
+    public void setAssertions(RegisterMHR.Assertions value) {
         this.assertions = value;
     }
 
@@ -433,10 +433,10 @@ public void setAssertions(RegisterPCEHR.Assertions value) {
     public static class Assertions {
 
         @XmlElement(required = true)
-        protected RegisterPCEHR.Assertions.Identity identity;
-        protected RegisterPCEHR.Assertions.DocumentConsent documentConsent;
+        protected RegisterMHR.Assertions.Identity identity;
+        protected RegisterMHR.Assertions.DocumentConsent documentConsent;
         @XmlElement(required = true)
-        protected RegisterPCEHR.Assertions.IvcCorrespondence ivcCorrespondence;
+        protected RegisterMHR.Assertions.IvcCorrespondence ivcCorrespondence;
         protected boolean acceptedTermsAndConditions;
         protected Boolean representativeDeclaration;
 
@@ -445,10 +445,10 @@ public static class Assertions {
          * 
          * @return the result
          *     possible object is
-         *     {@link RegisterPCEHR.Assertions.Identity }
+         *     {@link RegisterMHR.Assertions.Identity }
          *     
          */
-        public RegisterPCEHR.Assertions.Identity getIdentity() {
+        public RegisterMHR.Assertions.Identity getIdentity() {
             return identity;
         }
 
@@ -457,10 +457,10 @@ public RegisterPCEHR.Assertions.Identity getIdentity() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link RegisterPCEHR.Assertions.Identity }
+         *     {@link RegisterMHR.Assertions.Identity }
          *     
          */
-        public void setIdentity(RegisterPCEHR.Assertions.Identity value) {
+        public void setIdentity(RegisterMHR.Assertions.Identity value) {
             this.identity = value;
         }
 
@@ -469,10 +469,10 @@ public void setIdentity(RegisterPCEHR.Assertions.Identity value) {
          * 
          * @return the result
          *     possible object is
-         *     {@link RegisterPCEHR.Assertions.DocumentConsent }
+         *     {@link RegisterMHR.Assertions.DocumentConsent }
          *     
          */
-        public RegisterPCEHR.Assertions.DocumentConsent getDocumentConsent() {
+        public RegisterMHR.Assertions.DocumentConsent getDocumentConsent() {
             return documentConsent;
         }
 
@@ -481,10 +481,10 @@ public RegisterPCEHR.Assertions.DocumentConsent getDocumentConsent() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link RegisterPCEHR.Assertions.DocumentConsent }
+         *     {@link RegisterMHR.Assertions.DocumentConsent }
          *     
          */
-        public void setDocumentConsent(RegisterPCEHR.Assertions.DocumentConsent value) {
+        public void setDocumentConsent(RegisterMHR.Assertions.DocumentConsent value) {
             this.documentConsent = value;
         }
 
@@ -493,10 +493,10 @@ public void setDocumentConsent(RegisterPCEHR.Assertions.DocumentConsent value) {
          * 
          * @return the result
          *     possible object is
-         *     {@link RegisterPCEHR.Assertions.IvcCorrespondence }
+         *     {@link RegisterMHR.Assertions.IvcCorrespondence }
          *     
          */
-        public RegisterPCEHR.Assertions.IvcCorrespondence getIvcCorrespondence() {
+        public RegisterMHR.Assertions.IvcCorrespondence getIvcCorrespondence() {
             return ivcCorrespondence;
         }
 
@@ -505,10 +505,10 @@ public RegisterPCEHR.Assertions.IvcCorrespondence getIvcCorrespondence() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link RegisterPCEHR.Assertions.IvcCorrespondence }
+         *     {@link RegisterMHR.Assertions.IvcCorrespondence }
          *     
          */
-        public void setIvcCorrespondence(RegisterPCEHR.Assertions.IvcCorrespondence value) {
+        public void setIvcCorrespondence(RegisterMHR.Assertions.IvcCorrespondence value) {
             this.ivcCorrespondence = value;
         }
 
@@ -610,7 +610,7 @@ public void setRepresentativeDeclaration(Boolean value) {
         public static class DocumentConsent {
 
             @XmlElement(name = "document", required = true)
-            protected List<RegisterPCEHR.Assertions.DocumentConsent.Document> documents;
+            protected List<RegisterMHR.Assertions.DocumentConsent.Document> documents;
 
             /**
              * Gets the value of the documents property.
@@ -627,14 +627,14 @@ public static class DocumentConsent {
              * 
              * 
              * <p>Objects of the following type(s) are allowed in the list
-             * {@link RegisterPCEHR.Assertions.DocumentConsent.Document }
+             * {@link RegisterMHR.Assertions.DocumentConsent.Document }
              * 
              * 
              * @return field value
              */
-            public List<RegisterPCEHR.Assertions.DocumentConsent.Document> getDocuments() {
+            public List<RegisterMHR.Assertions.DocumentConsent.Document> getDocuments() {
                 if (documents == null) {
-                    documents = new ArrayList<RegisterPCEHR.Assertions.DocumentConsent.Document>();
+                    documents = new ArrayList<RegisterMHR.Assertions.DocumentConsent.Document>();
                 }
                 return this.documents;
             }
@@ -809,7 +809,7 @@ public void setStatus(String value) {
         public static class Identity {
 
             @XmlElement(required = true)
-            protected RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity evidenceOfIdentity;
+            protected RegisterMHR.Assertions.Identity.EvidenceOfIdentity evidenceOfIdentity;
             @XmlElement(required = true)
             protected String indigenousStatus;
             protected byte[] signedConsentForm;
@@ -819,10 +819,10 @@ public static class Identity {
              * 
              * @return the result
              *     possible object is
-             *     {@link RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity }
+             *     {@link RegisterMHR.Assertions.Identity.EvidenceOfIdentity }
              *     
              */
-            public RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity getEvidenceOfIdentity() {
+            public RegisterMHR.Assertions.Identity.EvidenceOfIdentity getEvidenceOfIdentity() {
                 return evidenceOfIdentity;
             }
 
@@ -831,10 +831,10 @@ public RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity getEvidenceOfIdentit
              * 
              * @param value field value
              *     allowed object is
-             *     {@link RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity }
+             *     {@link RegisterMHR.Assertions.Identity.EvidenceOfIdentity }
              *     
              */
-            public void setEvidenceOfIdentity(RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity value) {
+            public void setEvidenceOfIdentity(RegisterMHR.Assertions.Identity.EvidenceOfIdentity value) {
                 this.evidenceOfIdentity = value;
             }
 
@@ -1090,17 +1090,17 @@ public void setContactDetails(ContactDetailsType value) {
     public static class Individual {
 
         @XmlElement(required = true)
-        protected RegisterPCEHR.Individual.Demographics demographics;
+        protected RegisterMHR.Individual.Demographics demographics;
 
         /**
          * Gets the value of the demographics property.
          * 
          * @return the result
          *     possible object is
-         *     {@link RegisterPCEHR.Individual.Demographics }
+         *     {@link RegisterMHR.Individual.Demographics }
          *     
          */
-        public RegisterPCEHR.Individual.Demographics getDemographics() {
+        public RegisterMHR.Individual.Demographics getDemographics() {
             return demographics;
         }
 
@@ -1109,10 +1109,10 @@ public RegisterPCEHR.Individual.Demographics getDemographics() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link RegisterPCEHR.Individual.Demographics }
+         *     {@link RegisterMHR.Individual.Demographics }
          *     
          */
-        public void setDemographics(RegisterPCEHR.Individual.Demographics value) {
+        public void setDemographics(RegisterMHR.Individual.Demographics value) {
             this.demographics = value;
         }
 
@@ -1304,7 +1304,7 @@ public static class Representative {
 
         @XmlElement(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0")
         protected String ihiNumber;
-        protected RegisterPCEHR.Representative.Demographics demographics;
+        protected RegisterMHR.Representative.Demographics demographics;
 
         /**
          * Gets the value of the ihiNumber property.
@@ -1335,10 +1335,10 @@ public void setIhiNumber(String value) {
          * 
          * @return the result
          *     possible object is
-         *     {@link RegisterPCEHR.Representative.Demographics }
+         *     {@link RegisterMHR.Representative.Demographics }
          *     
          */
-        public RegisterPCEHR.Representative.Demographics getDemographics() {
+        public RegisterMHR.Representative.Demographics getDemographics() {
             return demographics;
         }
 
@@ -1347,10 +1347,10 @@ public RegisterPCEHR.Representative.Demographics getDemographics() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link RegisterPCEHR.Representative.Demographics }
+         *     {@link RegisterMHR.Representative.Demographics }
          *     
          */
-        public void setDemographics(RegisterPCEHR.Representative.Demographics value) {
+        public void setDemographics(RegisterMHR.Representative.Demographics value) {
             this.demographics = value;
         }
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/RegisterPCEHRResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/RegisterMHRResponse.java
similarity index 92%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/RegisterPCEHRResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/RegisterMHRResponse.java
index 76efc61..07483f0 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/RegisterPCEHRResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/RegisterMHRResponse.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2;
 
 import java.util.Calendar;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -11,8 +11,8 @@
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import au.gov.nehta.schema.DateAdapter;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.IndividualTypeSupp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 
 
 /**
@@ -84,12 +84,12 @@
     "ivcDetails"
 })
 @XmlRootElement(name = "registerPCEHRResponse")
-public class RegisterPCEHRResponse {
+public class RegisterMHRResponse {
 
     @XmlElement(required = true)
     protected ResponseStatusType responseStatus;
-    protected RegisterPCEHRResponse.Individual individual;
-    protected RegisterPCEHRResponse.IvcDetails ivcDetails;
+    protected RegisterMHRResponse.Individual individual;
+    protected RegisterMHRResponse.IvcDetails ivcDetails;
 
     /**
      * Gets the value of the responseStatus property.
@@ -120,10 +120,10 @@ public void setResponseStatus(ResponseStatusType value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link RegisterPCEHRResponse.Individual }
+     *     {@link RegisterMHRResponse.Individual }
      *     
      */
-    public RegisterPCEHRResponse.Individual getIndividual() {
+    public RegisterMHRResponse.Individual getIndividual() {
         return individual;
     }
 
@@ -132,10 +132,10 @@ public RegisterPCEHRResponse.Individual getIndividual() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link RegisterPCEHRResponse.Individual }
+     *     {@link RegisterMHRResponse.Individual }
      *     
      */
-    public void setIndividual(RegisterPCEHRResponse.Individual value) {
+    public void setIndividual(RegisterMHRResponse.Individual value) {
         this.individual = value;
     }
 
@@ -144,10 +144,10 @@ public void setIndividual(RegisterPCEHRResponse.Individual value) {
      * 
      * @return the result
      *     possible object is
-     *     {@link RegisterPCEHRResponse.IvcDetails }
+     *     {@link RegisterMHRResponse.IvcDetails }
      *     
      */
-    public RegisterPCEHRResponse.IvcDetails getIvcDetails() {
+    public RegisterMHRResponse.IvcDetails getIvcDetails() {
         return ivcDetails;
     }
 
@@ -156,10 +156,10 @@ public RegisterPCEHRResponse.IvcDetails getIvcDetails() {
      * 
      * @param value field value
      *     allowed object is
-     *     {@link RegisterPCEHRResponse.IvcDetails }
+     *     {@link RegisterMHRResponse.IvcDetails }
      *     
      */
-    public void setIvcDetails(RegisterPCEHRResponse.IvcDetails value) {
+    public void setIvcDetails(RegisterMHRResponse.IvcDetails value) {
         this.ivcDetails = value;
     }
 
@@ -207,7 +207,7 @@ public static class Individual {
         @XmlElement(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", required = true)
         protected String ihiNumber;
         @XmlElement(required = true)
-        protected RegisterPCEHRResponse.Individual.Demographics demographics;
+        protected RegisterMHRResponse.Individual.Demographics demographics;
 
         /**
          * Gets the value of the ihiNumber property.
@@ -238,10 +238,10 @@ public void setIhiNumber(String value) {
          * 
          * @return the result
          *     possible object is
-         *     {@link RegisterPCEHRResponse.Individual.Demographics }
+         *     {@link RegisterMHRResponse.Individual.Demographics }
          *     
          */
-        public RegisterPCEHRResponse.Individual.Demographics getDemographics() {
+        public RegisterMHRResponse.Individual.Demographics getDemographics() {
             return demographics;
         }
 
@@ -250,10 +250,10 @@ public RegisterPCEHRResponse.Individual.Demographics getDemographics() {
          * 
          * @param value field value
          *     allowed object is
-         *     {@link RegisterPCEHRResponse.Individual.Demographics }
+         *     {@link RegisterMHRResponse.Individual.Demographics }
          *     
          */
-        public void setDemographics(RegisterPCEHRResponse.Individual.Demographics value) {
+        public void setDemographics(RegisterMHRResponse.Individual.Demographics value) {
             this.demographics = value;
         }
 
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/package-info.java
similarity index 72%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/package-info.java
index 2e77bec..3c6c0a7 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/registermhr/_2/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.registermhr._2;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/ObjectFactory.java
similarity index 84%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/ObjectFactory.java
index 4391824..0e9d114 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/RemoveDocument.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/RemoveDocument.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/RemoveDocument.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/RemoveDocument.java
index 975550b..66b3947 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/RemoveDocument.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/RemoveDocument.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/RemoveDocumentResponse.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/RemoveDocumentResponse.java
similarity index 90%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/RemoveDocumentResponse.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/RemoveDocumentResponse.java
index 8a39161..98706f6 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/RemoveDocumentResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/RemoveDocumentResponse.java
@@ -1,12 +1,12 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 
 
 /**
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/package-info.java
similarity index 72%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/package-info.java
index 8f45d17..d92ed5b 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/removedocument/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/interfaces/removedocument/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.removedocument._1;
+package au.net.electronichealth.ns.mhr.xsd.interfaces.removedocument._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ACICodedType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ACICodedType.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ACICodedType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ACICodedType.java
index 7fe53a4..21849f1 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ACICodedType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ACICodedType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/AddressTypeDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/AddressTypeDT.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/AddressTypeDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/AddressTypeDT.java
index 8e39a26..87d2ebc 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/AddressTypeDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/AddressTypeDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/CodedType.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/CodedType.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/CodedType.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/CodedType.java
index ba6fd24..fe084b1 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/CodedType.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/CodedType.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ContactDetailsDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ContactDetailsDT.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ContactDetailsDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ContactDetailsDT.java
index c9472f6..bd666ed 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ContactDetailsDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ContactDetailsDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/DiagnosticReportInformationDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/DiagnosticReportInformationDT.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/DiagnosticReportInformationDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/DiagnosticReportInformationDT.java
index 58a93a8..4853aaa 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/DiagnosticReportInformationDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/DiagnosticReportInformationDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/DocumentDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/DocumentDT.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/DocumentDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/DocumentDT.java
index 7b8c704..db64250 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/DocumentDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/DocumentDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/InformationAvailableDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/InformationAvailableDT.java
similarity index 97%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/InformationAvailableDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/InformationAvailableDT.java
index 94dea1e..9891a7a 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/InformationAvailableDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/InformationAvailableDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/NameTypeDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/NameTypeDT.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/NameTypeDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/NameTypeDT.java
index a0c510e..7f12dbc 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/NameTypeDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/NameTypeDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ObjectFactory.java
similarity index 94%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ObjectFactory.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ObjectFactory.java
index cac8693..0783216 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
@@ -7,7 +7,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1 package. 
+ * generated in the au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -23,7 +23,7 @@ public class ObjectFactory {
 
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/PathologyReportInformationDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/PathologyReportInformationDT.java
similarity index 99%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/PathologyReportInformationDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/PathologyReportInformationDT.java
index 566282b..2af9275 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/PathologyReportInformationDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/PathologyReportInformationDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ProviderInformationDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ProviderInformationDT.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ProviderInformationDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ProviderInformationDT.java
index e3af2eb..7fb50be 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/ProviderInformationDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/ProviderInformationDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/RequesterInformationDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/RequesterInformationDT.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/RequesterInformationDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/RequesterInformationDT.java
index 4aea685..fbdd56f 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/RequesterInformationDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/RequesterInformationDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/TimeStampDT.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/TimeStampDT.java
similarity index 98%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/TimeStampDT.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/TimeStampDT.java
index 347f675..5464ee9 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/TimeStampDT.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/TimeStampDT.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/Usage.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/Usage.java
similarity index 92%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/Usage.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/Usage.java
index fd3fcfe..396e604 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/Usage.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/Usage.java
@@ -1,5 +1,5 @@
 
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/package-info.java b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/package-info.java
similarity index 73%
rename from src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/package-info.java
rename to src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/package-info.java
index 34a82a4..9c4a7bc 100644
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/view/viewcommontype/_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/mhr/xsd/view/viewcommontype/_1/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package au.net.electronichealth.ns.pcehr.xsd.view.viewcommontype._1;
+package au.net.electronichealth.ns.mhr.xsd.view.viewcommontype._1;
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/StandardErrorMsg.java
deleted file mode 100644
index 2c1273d..0000000
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getindividualdetailsview/_2/StandardErrorMsg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package au.net.electronichealth.ns.pcehr.svc.getindividualdetailsview._2;
-
-import javax.xml.ws.WebFault;
-import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.8
- * Generated source version: 2.2
- * 
- */
-@WebFault(name = "standardError", targetNamespace = "http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010")
-public class StandardErrorMsg
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private StandardError faultInfo;
-
-    /**
-     * 
-     * @param message exception message
-     * @param faultInfo SOAP fault detail
-     */
-    public StandardErrorMsg(String message, StandardError faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * 
-     * @param message exception message
-     * @param faultInfo SOAP fault detail
-     * @param cause underlying cause
-     */
-    public StandardErrorMsg(String message, StandardError faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * 
-     * @return SOAP fault detail bean: au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError
-     */
-    public StandardError getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/StandardErrorMsg.java
deleted file mode 100644
index eca693f..0000000
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/getrepresentativelist/_1/StandardErrorMsg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package au.net.electronichealth.ns.pcehr.svc.getrepresentativelist._1;
-
-import javax.xml.ws.WebFault;
-import au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.8
- * Generated source version: 2.2
- * 
- */
-@WebFault(name = "standardError", targetNamespace = "http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010")
-public class StandardErrorMsg
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private StandardError faultInfo;
-
-    /**
-     * 
-     * @param message exception message
-     * @param faultInfo SOAP fault detail
-     */
-    public StandardErrorMsg(String message, StandardError faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * 
-     * @param message exception message
-     * @param faultInfo SOAP fault detail
-     * @param cause underlying cause
-     */
-    public StandardErrorMsg(String message, StandardError faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * 
-     * @return SOAP fault detail bean: au.net.electronichealth.ns.wsp.xsd.standarderror._2010.StandardError
-     */
-    public StandardError getFaultInfo() {
-        return faultInfo;
-    }
-
-}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/RegisterPCEHRPortType.java b/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/RegisterPCEHRPortType.java
deleted file mode 100644
index 717b339..0000000
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/RegisterPCEHRPortType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package au.net.electronichealth.ns.pcehr.svc.registerpcehr._2;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2.RegisterPCEHR;
-import au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2.RegisterPCEHRResponse;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.8
- * Generated source version: 2.2
- * 
- */
-@WebService(name = "RegisterPCEHRPortType", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0")
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2.ObjectFactory.class,
-    au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
-})
-public interface RegisterPCEHRPortType {
-
-
-    /**
-     * 
-     * @param pcehrHeader PCEHR request header
-     * @param parameters0 SOAP response holder
-     * @param timestampHeader timestamp SOAP header
-     * @param parameters request payload
-     * @param signatureHeader signature SOAP header holder
-     * @throws StandardErrorMsg if the service returns a StandardErrorMsg fault
-     */
-    @WebMethod
-    @Action(input = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0/RegisterPCEHRPortType/registerPCEHRRequest", output = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0/RegisterPCEHRPortType/registerPCEHRResponse", fault = {
-        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0/RegisterPCEHRPortType/Fault/standardError")
-    })
-    public void registerPCEHR(
-        @WebParam(name = "registerPCEHR", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0", partName = "parameters")
-        RegisterPCEHR parameters,
-        @WebParam(name = "registerPCEHRResponse", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0", mode = WebParam.Mode.OUT, partName = "parameters")
-        Holder<RegisterPCEHRResponse> parameters0,
-        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "timestampHeader")
-        Timestamp timestampHeader,
-        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
-        Holder<Signature> signatureHeader,
-        @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
-        throws StandardErrorMsg
-    ;
-
-}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/RegisterPCEHRService.java b/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/RegisterPCEHRService.java
deleted file mode 100644
index 03693c9..0000000
--- a/src/main/java/au/net/electronichealth/ns/pcehr/svc/registerpcehr/_2/RegisterPCEHRService.java
+++ /dev/null
@@ -1,90 +0,0 @@
-
-package au.net.electronichealth.ns.pcehr.svc.registerpcehr._2;
-
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.8
- * Generated source version: 2.2
- * 
- */
-@WebServiceClient(name = "registerPCEHRService", targetNamespace = "http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", wsdlLocation = "wsdl/B2B_RegisterPCEHR.wsdl")
-public class RegisterPCEHRService
-    extends Service
-{
-
-    private final static URL REGISTERPCEHRSERVICE_WSDL_LOCATION;
-    private final static WebServiceException REGISTERPCEHRSERVICE_EXCEPTION;
-    private final static QName REGISTERPCEHRSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", "registerPCEHRService");
-
-    static {
-        REGISTERPCEHRSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.pcehr.svc.registerpcehr._2.RegisterPCEHRService.class.getResource("wsdl/B2B_RegisterPCEHR.wsdl");
-        WebServiceException e = null;
-        if (REGISTERPCEHRSERVICE_WSDL_LOCATION == null) {
-            e = new WebServiceException("Cannot find 'wsdl/B2B_RegisterPCEHR.wsdl' wsdl. Place the resource correctly in the classpath.");
-        }
-        REGISTERPCEHRSERVICE_EXCEPTION = e;
-    }
-
-    public RegisterPCEHRService() {
-        super(__getWsdlLocation(), REGISTERPCEHRSERVICE_QNAME);
-    }
-
-    public RegisterPCEHRService(WebServiceFeature... features) {
-        super(__getWsdlLocation(), REGISTERPCEHRSERVICE_QNAME, features);
-    }
-
-    public RegisterPCEHRService(URL wsdlLocation) {
-        super(wsdlLocation, REGISTERPCEHRSERVICE_QNAME);
-    }
-
-    public RegisterPCEHRService(URL wsdlLocation, WebServiceFeature... features) {
-        super(wsdlLocation, REGISTERPCEHRSERVICE_QNAME, features);
-    }
-
-    public RegisterPCEHRService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public RegisterPCEHRService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
-        super(wsdlLocation, serviceName, features);
-    }
-
-    /**
-     * 
-     * @return the result
-     *     returns RegisterPCEHRPortType
-     */
-    @WebEndpoint(name = "registerPCEHRSOAP12Port")
-    public RegisterPCEHRPortType getRegisterPCEHRSOAP12Port() {
-        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", "registerPCEHRSOAP12Port"), RegisterPCEHRPortType.class);
-    }
-
-    /**
-     * 
-     * @param features web service features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return the result
-     *     returns RegisterPCEHRPortType
-     */
-    @WebEndpoint(name = "registerPCEHRSOAP12Port")
-    public RegisterPCEHRPortType getRegisterPCEHRSOAP12Port(WebServiceFeature... features) {
-        return super.getPort(new QName("http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0", "registerPCEHRSOAP12Port"), RegisterPCEHRPortType.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (REGISTERPCEHRSERVICE_EXCEPTION!= null) {
-            throw REGISTERPCEHRSERVICE_EXCEPTION;
-        }
-        return REGISTERPCEHRSERVICE_WSDL_LOCATION;
-    }
-
-}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/ObjectFactory.java
deleted file mode 100644
index 8484838..0000000
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/pcehrprofile/_1/ObjectFactory.java
+++ /dev/null
@@ -1,110 +0,0 @@
-
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1 package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _DoesPCEHRExist_QNAME = new QName("http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", "doesPCEHRExist");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.pcehrprofile._1
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link DoesPCEHRExistResponse }
-     * 
-     * @return newly created instance
-     */
-    public DoesPCEHRExistResponse createDoesPCEHRExistResponse() {
-        return new DoesPCEHRExistResponse();
-    }
-
-    /**
-     * Create an instance of {@link GainPCEHRAccess }
-     * 
-     * @return newly created instance
-     */
-    public GainPCEHRAccess createGainPCEHRAccess() {
-        return new GainPCEHRAccess();
-    }
-
-    /**
-     * Create an instance of {@link GainPCEHRAccess.PCEHRRecord }
-     * 
-     * @return newly created instance
-     */
-    public GainPCEHRAccess.PCEHRRecord createGainPCEHRAccessPCEHRRecord() {
-        return new GainPCEHRAccess.PCEHRRecord();
-    }
-
-    /**
-     * Create an instance of {@link GainPCEHRAccess.PCEHRRecord.AuthorisationDetails }
-     * 
-     * @return newly created instance
-     */
-    public GainPCEHRAccess.PCEHRRecord.AuthorisationDetails createGainPCEHRAccessPCEHRRecordAuthorisationDetails() {
-        return new GainPCEHRAccess.PCEHRRecord.AuthorisationDetails();
-    }
-
-    /**
-     * Create an instance of {@link GainPCEHRAccessResponse }
-     * 
-     * @return newly created instance
-     */
-    public GainPCEHRAccessResponse createGainPCEHRAccessResponse() {
-        return new GainPCEHRAccessResponse();
-    }
-
-    /**
-     * Create an instance of {@link GainPCEHRAccessResponse.Individual }
-     * 
-     * @return newly created instance
-     */
-    public GainPCEHRAccessResponse.Individual createGainPCEHRAccessResponseIndividual() {
-        return new GainPCEHRAccessResponse.Individual();
-    }
-
-    /**
-     * Create an instance of {@link GainPCEHRAccess.PCEHRRecord.Individual }
-     * 
-     * @return newly created instance
-     */
-    public GainPCEHRAccess.PCEHRRecord.Individual createGainPCEHRAccessPCEHRRecordIndividual() {
-        return new GainPCEHRAccess.PCEHRRecord.Individual();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object }&gt;}
-     * 
-     * @param value field value
-     * @return newly created instance
-     */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0", name = "doesPCEHRExist")
-    public JAXBElement<Object> createDoesPCEHRExist(Object value) {
-        return new JAXBElement<Object>(_DoesPCEHRExist_QNAME, Object.class, null, value);
-    }
-
-}
diff --git a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/ObjectFactory.java
deleted file mode 100644
index f7b300e..0000000
--- a/src/main/java/au/net/electronichealth/ns/pcehr/xsd/interfaces/registerpcehr/_2/ObjectFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-
-package au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2 package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.pcehr.xsd.interfaces.registerpcehr._2
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHRResponse }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHRResponse createRegisterPCEHRResponse() {
-        return new RegisterPCEHRResponse();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR createRegisterPCEHR() {
-        return new RegisterPCEHR();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Assertions }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Assertions createRegisterPCEHRAssertions() {
-        return new RegisterPCEHR.Assertions();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Assertions.DocumentConsent }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Assertions.DocumentConsent createRegisterPCEHRAssertionsDocumentConsent() {
-        return new RegisterPCEHR.Assertions.DocumentConsent();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Assertions.Identity }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Assertions.Identity createRegisterPCEHRAssertionsIdentity() {
-        return new RegisterPCEHR.Assertions.Identity();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Individual }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Individual createRegisterPCEHRIndividual() {
-        return new RegisterPCEHR.Individual();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Representative }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Representative createRegisterPCEHRRepresentative() {
-        return new RegisterPCEHR.Representative();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHRResponse.Individual }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHRResponse.Individual createRegisterPCEHRResponseIndividual() {
-        return new RegisterPCEHRResponse.Individual();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHRResponse.IvcDetails }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHRResponse.IvcDetails createRegisterPCEHRResponseIvcDetails() {
-        return new RegisterPCEHRResponse.IvcDetails();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Assertions.IvcCorrespondence }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Assertions.IvcCorrespondence createRegisterPCEHRAssertionsIvcCorrespondence() {
-        return new RegisterPCEHR.Assertions.IvcCorrespondence();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Assertions.DocumentConsent.Document }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Assertions.DocumentConsent.Document createRegisterPCEHRAssertionsDocumentConsentDocument() {
-        return new RegisterPCEHR.Assertions.DocumentConsent.Document();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity createRegisterPCEHRAssertionsIdentityEvidenceOfIdentity() {
-        return new RegisterPCEHR.Assertions.Identity.EvidenceOfIdentity();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Individual.Demographics }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Individual.Demographics createRegisterPCEHRIndividualDemographics() {
-        return new RegisterPCEHR.Individual.Demographics();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHR.Representative.Demographics }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHR.Representative.Demographics createRegisterPCEHRRepresentativeDemographics() {
-        return new RegisterPCEHR.Representative.Demographics();
-    }
-
-    /**
-     * Create an instance of {@link RegisterPCEHRResponse.Individual.Demographics }
-     * 
-     * @return newly created instance
-     */
-    public RegisterPCEHRResponse.Individual.Demographics createRegisterPCEHRResponseIndividualDemographics() {
-        return new RegisterPCEHRResponse.Individual.Demographics();
-    }
-
-}
diff --git a/src/main/java/au/net/electronichealth/ns/tplt/svc/gettemplate/_1/GetTemplatePortType.java b/src/main/java/au/net/electronichealth/ns/tplt/svc/gettemplate/_1/GetTemplatePortType.java
index 23913f8..6c5f961 100644
--- a/src/main/java/au/net/electronichealth/ns/tplt/svc/gettemplate/_1/GetTemplatePortType.java
+++ b/src/main/java/au/net/electronichealth/ns/tplt/svc/gettemplate/_1/GetTemplatePortType.java
@@ -9,9 +9,9 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
 import au.net.electronichealth.ns.tplt.xsd.interfaces.gettemplate._1.GetTemplate;
 import au.net.electronichealth.ns.tplt.xsd.interfaces.gettemplate._1.GetTemplateResponse;
 
@@ -25,18 +25,18 @@
 @WebService(name = "GetTemplatePortType", targetNamespace = "http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
     au.net.electronichealth.ns.tplt.xsd.interfaces.gettemplate._1.ObjectFactory.class,
     au.net.electronichealth.ns.tplt.xsd.common.templatescoreelements._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface GetTemplatePortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -57,7 +57,7 @@ public void getTemplate(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/tplt/svc/searchtemplate/_1/SearchTemplatePortType.java b/src/main/java/au/net/electronichealth/ns/tplt/svc/searchtemplate/_1/SearchTemplatePortType.java
index 894d6d0..f978239 100644
--- a/src/main/java/au/net/electronichealth/ns/tplt/svc/searchtemplate/_1/SearchTemplatePortType.java
+++ b/src/main/java/au/net/electronichealth/ns/tplt/svc/searchtemplate/_1/SearchTemplatePortType.java
@@ -9,9 +9,9 @@
 import javax.xml.ws.Action;
 import javax.xml.ws.FaultAction;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
 import au.net.electronichealth.ns.tplt.xsd.interfaces.searchtemplate._1.SearchTemplate;
 import au.net.electronichealth.ns.tplt.xsd.interfaces.searchtemplate._1.SearchTemplateResponse;
 
@@ -25,18 +25,18 @@
 @WebService(name = "SearchTemplatePortType", targetNamespace = "http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
     au.net.electronichealth.ns.tplt.xsd.interfaces.searchtemplate._1.ObjectFactory.class,
     au.net.electronichealth.ns.tplt.xsd.common.templatescoreelements._1.ObjectFactory.class,
     au.net.electronichealth.ns.wsp.xsd.standarderror._2010.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface SearchTemplatePortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param parameters0 SOAP response holder
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
@@ -57,7 +57,7 @@ public void searchTemplate(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader)
+        MHRHeader mhrHeader)
         throws StandardErrorMsg
     ;
 
diff --git a/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/gettemplate/_1/GetTemplateResponse.java b/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/gettemplate/_1/GetTemplateResponse.java
index eab21b6..9f9b913 100644
--- a/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/gettemplate/_1/GetTemplateResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/gettemplate/_1/GetTemplateResponse.java
@@ -7,7 +7,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 import au.net.electronichealth.ns.tplt.xsd.common.templatescoreelements._1.TemplateMetadataType;
 import au.net.electronichealth.ns.tplt.xsd.common.templatescoreelements._1.TemplateUsageMetadataType;
 
diff --git a/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/searchtemplate/_1/SearchTemplateResponse.java b/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/searchtemplate/_1/SearchTemplateResponse.java
index 9007869..9187b49 100644
--- a/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/searchtemplate/_1/SearchTemplateResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/tplt/xsd/interfaces/searchtemplate/_1/SearchTemplateResponse.java
@@ -8,7 +8,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ResponseStatusType;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ResponseStatusType;
 import au.net.electronichealth.ns.tplt.xsd.common.templatescoreelements._1.TemplateMetadataType;
 import au.net.electronichealth.ns.tplt.xsd.common.templatescoreelements._1.TemplateUsageMetadataType;
 
diff --git a/src/main/java/ihe/iti/xds_b/_2007/DocumentRegistryPortType.java b/src/main/java/ihe/iti/xds_b/_2007/DocumentRegistryPortType.java
index 396bba5..698d73f 100644
--- a/src/main/java/ihe/iti/xds_b/_2007/DocumentRegistryPortType.java
+++ b/src/main/java/ihe/iti/xds_b/_2007/DocumentRegistryPortType.java
@@ -8,9 +8,9 @@
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
 import oasis.names.tc.ebxml_regrep.xsd.lcm._3.SubmitObjectsRequest;
 import oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryRequest;
 import oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryResponse;
@@ -26,19 +26,19 @@
 @WebService(name = "DocumentRegistry_PortType", targetNamespace = "urn:ihe:iti:xds-b:2007")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.lcm._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.query._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.rs._3.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface DocumentRegistryPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
      * @param signatureHeader signature SOAP header holder
@@ -53,13 +53,13 @@ public RegistryResponseType documentRegistryRegisterDocumentSetB(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader,
+        MHRHeader mhrHeader,
         @WebParam(name = "SubmitObjectsRequest", targetNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:lcm:3.0", partName = "parameters")
         SubmitObjectsRequest parameters);
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
      * @param signatureHeader signature SOAP header holder
@@ -74,7 +74,7 @@ public AdhocQueryResponse documentRegistryRegistryStoredQuery(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader,
+        MHRHeader mhrHeader,
         @WebParam(name = "AdhocQueryRequest", targetNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", partName = "parameters")
         AdhocQueryRequest parameters);
 
diff --git a/src/main/java/ihe/iti/xds_b/_2007/DocumentRepositoryPortType.java b/src/main/java/ihe/iti/xds_b/_2007/DocumentRepositoryPortType.java
index f8ef640..3e2b301 100644
--- a/src/main/java/ihe/iti/xds_b/_2007/DocumentRepositoryPortType.java
+++ b/src/main/java/ihe/iti/xds_b/_2007/DocumentRepositoryPortType.java
@@ -8,9 +8,9 @@
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.ws.Holder;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.PCEHRHeader;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Signature;
-import au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.Timestamp;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.MHRHeader;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Signature;
+import au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.Timestamp;
 import oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType;
 
 
@@ -23,20 +23,20 @@
 @WebService(name = "DocumentRepository_PortType", targetNamespace = "urn:ihe:iti:xds-b:2007")
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.common.commoncoreelements._1.ObjectFactory.class,
+    au.net.electronichealth.ns.mhr.xsd.common.commoncoreelements._1.ObjectFactory.class,
     ihe.iti.xds_b._2007.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.lcm._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.query._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectFactory.class,
     oasis.names.tc.ebxml_regrep.xsd.rs._3.ObjectFactory.class,
-    pcehr_override.org.w3.ObjectFactory.class
+    mhr_override.org.w3.ObjectFactory.class
 })
 public interface DocumentRepositoryPortType {
 
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
      * @param signatureHeader signature SOAP header holder
@@ -51,13 +51,13 @@ public RegistryResponseType documentRepositoryProvideAndRegisterDocumentSetB(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader,
+        MHRHeader mhrHeader,
         @WebParam(name = "ProvideAndRegisterDocumentSetRequest", targetNamespace = "urn:ihe:iti:xds-b:2007", partName = "parameters")
         ProvideAndRegisterDocumentSetRequest parameters);
 
     /**
      * 
-     * @param pcehrHeader PCEHR request header
+     * @param mhrHeader MHR request header
      * @param timestampHeader timestamp SOAP header
      * @param parameters request payload
      * @param signatureHeader signature SOAP header holder
@@ -72,7 +72,7 @@ public RetrieveDocumentSetResponse documentRepositoryRetrieveDocumentSet(
         @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
         Holder<Signature> signatureHeader,
         @WebParam(name = "PCEHRHeader", targetNamespace = "http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0", header = true, partName = "PCEHRHeader")
-        PCEHRHeader pcehrHeader,
+        MHRHeader mhrHeader,
         @WebParam(name = "RetrieveDocumentSetRequest", targetNamespace = "urn:ihe:iti:xds-b:2007", partName = "parameters")
         RetrieveDocumentSetRequest parameters);
 
diff --git a/src/main/java/pcehr_override/org/w3/CanonicalizationMethod.java b/src/main/java/mhr_override/org/w3/CanonicalizationMethod.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/CanonicalizationMethod.java
rename to src/main/java/mhr_override/org/w3/CanonicalizationMethod.java
index 1ca557f..d5d9fed 100644
--- a/src/main/java/pcehr_override/org/w3/CanonicalizationMethod.java
+++ b/src/main/java/mhr_override/org/w3/CanonicalizationMethod.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/DSAKeyValue.java b/src/main/java/mhr_override/org/w3/DSAKeyValue.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/DSAKeyValue.java
rename to src/main/java/mhr_override/org/w3/DSAKeyValue.java
index 9b1fb2c..da17ef4 100644
--- a/src/main/java/pcehr_override/org/w3/DSAKeyValue.java
+++ b/src/main/java/mhr_override/org/w3/DSAKeyValue.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/pcehr_override/org/w3/DigestMethod.java b/src/main/java/mhr_override/org/w3/DigestMethod.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/DigestMethod.java
rename to src/main/java/mhr_override/org/w3/DigestMethod.java
index 84c0d94..edc4f52 100644
--- a/src/main/java/pcehr_override/org/w3/DigestMethod.java
+++ b/src/main/java/mhr_override/org/w3/DigestMethod.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/KeyInfo.java b/src/main/java/mhr_override/org/w3/KeyInfo.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/KeyInfo.java
rename to src/main/java/mhr_override/org/w3/KeyInfo.java
index 3a49266..c5f7a10 100644
--- a/src/main/java/pcehr_override/org/w3/KeyInfo.java
+++ b/src/main/java/mhr_override/org/w3/KeyInfo.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/KeyValue.java b/src/main/java/mhr_override/org/w3/KeyValue.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/KeyValue.java
rename to src/main/java/mhr_override/org/w3/KeyValue.java
index b4b5e44..48ea14a 100644
--- a/src/main/java/pcehr_override/org/w3/KeyValue.java
+++ b/src/main/java/mhr_override/org/w3/KeyValue.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/Manifest.java b/src/main/java/mhr_override/org/w3/Manifest.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/Manifest.java
rename to src/main/java/mhr_override/org/w3/Manifest.java
index 91f6360..ad3a670 100644
--- a/src/main/java/pcehr_override/org/w3/Manifest.java
+++ b/src/main/java/mhr_override/org/w3/Manifest.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/Object.java b/src/main/java/mhr_override/org/w3/Object.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/Object.java
rename to src/main/java/mhr_override/org/w3/Object.java
index 290f7fe..e44348d 100644
--- a/src/main/java/pcehr_override/org/w3/Object.java
+++ b/src/main/java/mhr_override/org/w3/Object.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/ObjectFactory.java b/src/main/java/mhr_override/org/w3/ObjectFactory.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/ObjectFactory.java
rename to src/main/java/mhr_override/org/w3/ObjectFactory.java
index 7766015..8b05d6b 100644
--- a/src/main/java/pcehr_override/org/w3/ObjectFactory.java
+++ b/src/main/java/mhr_override/org/w3/ObjectFactory.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.math.BigInteger;
 import javax.xml.bind.JAXBElement;
@@ -11,7 +11,7 @@
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the pcehr_override.org.w3 package. 
+ * generated in the mhr_override.org.w3 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -38,7 +38,7 @@ public class ObjectFactory {
     private final static QName _TransformXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: pcehr_override.org.w3
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: mhr_override.org.w3
      * 
      */
     public ObjectFactory() {
diff --git a/src/main/java/pcehr_override/org/w3/PGPData.java b/src/main/java/mhr_override/org/w3/PGPData.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/PGPData.java
rename to src/main/java/mhr_override/org/w3/PGPData.java
index c31bd8b..d660482 100644
--- a/src/main/java/pcehr_override/org/w3/PGPData.java
+++ b/src/main/java/mhr_override/org/w3/PGPData.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/RSAKeyValue.java b/src/main/java/mhr_override/org/w3/RSAKeyValue.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/RSAKeyValue.java
rename to src/main/java/mhr_override/org/w3/RSAKeyValue.java
index 3ad7032..254ce50 100644
--- a/src/main/java/pcehr_override/org/w3/RSAKeyValue.java
+++ b/src/main/java/mhr_override/org/w3/RSAKeyValue.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/pcehr_override/org/w3/Reference.java b/src/main/java/mhr_override/org/w3/Reference.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/Reference.java
rename to src/main/java/mhr_override/org/w3/Reference.java
index 4a9037f..2effbf4 100644
--- a/src/main/java/pcehr_override/org/w3/Reference.java
+++ b/src/main/java/mhr_override/org/w3/Reference.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/pcehr_override/org/w3/RetrievalMethod.java b/src/main/java/mhr_override/org/w3/RetrievalMethod.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/RetrievalMethod.java
rename to src/main/java/mhr_override/org/w3/RetrievalMethod.java
index f3652f8..6485df8 100644
--- a/src/main/java/pcehr_override/org/w3/RetrievalMethod.java
+++ b/src/main/java/mhr_override/org/w3/RetrievalMethod.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/pcehr_override/org/w3/SPKIData.java b/src/main/java/mhr_override/org/w3/SPKIData.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/SPKIData.java
rename to src/main/java/mhr_override/org/w3/SPKIData.java
index b6530b9..0d491ab 100644
--- a/src/main/java/pcehr_override/org/w3/SPKIData.java
+++ b/src/main/java/mhr_override/org/w3/SPKIData.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/Signature.java b/src/main/java/mhr_override/org/w3/Signature.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/Signature.java
rename to src/main/java/mhr_override/org/w3/Signature.java
index acae0fc..b0fe7e3 100644
--- a/src/main/java/pcehr_override/org/w3/Signature.java
+++ b/src/main/java/mhr_override/org/w3/Signature.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/SignatureMethod.java b/src/main/java/mhr_override/org/w3/SignatureMethod.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/SignatureMethod.java
rename to src/main/java/mhr_override/org/w3/SignatureMethod.java
index c77a326..2235115 100644
--- a/src/main/java/pcehr_override/org/w3/SignatureMethod.java
+++ b/src/main/java/mhr_override/org/w3/SignatureMethod.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
diff --git a/src/main/java/pcehr_override/org/w3/SignatureProperties.java b/src/main/java/mhr_override/org/w3/SignatureProperties.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/SignatureProperties.java
rename to src/main/java/mhr_override/org/w3/SignatureProperties.java
index 8f11ed4..18bc8fa 100644
--- a/src/main/java/pcehr_override/org/w3/SignatureProperties.java
+++ b/src/main/java/mhr_override/org/w3/SignatureProperties.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/SignatureProperty.java b/src/main/java/mhr_override/org/w3/SignatureProperty.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/SignatureProperty.java
rename to src/main/java/mhr_override/org/w3/SignatureProperty.java
index 28ec5ac..efd2ac7 100644
--- a/src/main/java/pcehr_override/org/w3/SignatureProperty.java
+++ b/src/main/java/mhr_override/org/w3/SignatureProperty.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/SignatureValue.java b/src/main/java/mhr_override/org/w3/SignatureValue.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/SignatureValue.java
rename to src/main/java/mhr_override/org/w3/SignatureValue.java
index bb145f6..2c37c32 100644
--- a/src/main/java/pcehr_override/org/w3/SignatureValue.java
+++ b/src/main/java/mhr_override/org/w3/SignatureValue.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/pcehr_override/org/w3/SignedInfo.java b/src/main/java/mhr_override/org/w3/SignedInfo.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/SignedInfo.java
rename to src/main/java/mhr_override/org/w3/SignedInfo.java
index 369c895..4cad8f7 100644
--- a/src/main/java/pcehr_override/org/w3/SignedInfo.java
+++ b/src/main/java/mhr_override/org/w3/SignedInfo.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/Transform.java b/src/main/java/mhr_override/org/w3/Transform.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/Transform.java
rename to src/main/java/mhr_override/org/w3/Transform.java
index 0db2c20..f9dcbc3 100644
--- a/src/main/java/pcehr_override/org/w3/Transform.java
+++ b/src/main/java/mhr_override/org/w3/Transform.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/Transforms.java b/src/main/java/mhr_override/org/w3/Transforms.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/Transforms.java
rename to src/main/java/mhr_override/org/w3/Transforms.java
index 999cf7d..8c65f79 100644
--- a/src/main/java/pcehr_override/org/w3/Transforms.java
+++ b/src/main/java/mhr_override/org/w3/Transforms.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/X509Data.java b/src/main/java/mhr_override/org/w3/X509Data.java
similarity index 99%
rename from src/main/java/pcehr_override/org/w3/X509Data.java
rename to src/main/java/mhr_override/org/w3/X509Data.java
index 730806c..e30e8f5 100644
--- a/src/main/java/pcehr_override/org/w3/X509Data.java
+++ b/src/main/java/mhr_override/org/w3/X509Data.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pcehr_override/org/w3/X509IssuerSerialType.java b/src/main/java/mhr_override/org/w3/X509IssuerSerialType.java
similarity index 98%
rename from src/main/java/pcehr_override/org/w3/X509IssuerSerialType.java
rename to src/main/java/mhr_override/org/w3/X509IssuerSerialType.java
index a9b6df7..c0ca7f8 100644
--- a/src/main/java/pcehr_override/org/w3/X509IssuerSerialType.java
+++ b/src/main/java/mhr_override/org/w3/X509IssuerSerialType.java
@@ -1,5 +1,5 @@
 
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/pcehr_override/org/w3/package-info.java b/src/main/java/mhr_override/org/w3/package-info.java
similarity index 83%
rename from src/main/java/pcehr_override/org/w3/package-info.java
rename to src/main/java/mhr_override/org/w3/package-info.java
index f3aedb7..ed723d5 100644
--- a/src/main/java/pcehr_override/org/w3/package-info.java
+++ b/src/main/java/mhr_override/org/w3/package-info.java
@@ -1,2 +1,2 @@
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package pcehr_override.org.w3;
+package mhr_override.org.w3;
diff --git a/src/main/java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java b/src/main/java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java
index d723daf..5f67aca 100644
--- a/src/main/java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java
+++ b/src/main/java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java
@@ -39,7 +39,7 @@
     "registryErrorList"
 })
 @XmlSeeAlso({
-    au.net.electronichealth.ns.pcehr.xsd.interfaces.getchangehistoryview._1.GetChangeHistoryViewResponse.AdhocQueryResponse.class
+    au.net.electronichealth.ns.mhr.xsd.interfaces.getchangehistoryview._1.GetChangeHistoryViewResponse.AdhocQueryResponse.class
 })
 public class RegistryResponseType {
 
diff --git a/src/main/java/wsdls/schema/Common/PCEHR_CommonTypes.xsd b/src/main/java/wsdls/schema/Common/MHR_CommonTypes.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/Common/PCEHR_CommonTypes.xsd
rename to src/main/java/wsdls/schema/Common/MHR_CommonTypes.xsd
diff --git a/src/main/java/wsdls/schema/Common/PCEHR_CommonTypes_Supplementary.xsd b/src/main/java/wsdls/schema/Common/MHR_CommonTypes_Supplementary.xsd
similarity index 99%
rename from src/main/java/wsdls/schema/Common/PCEHR_CommonTypes_Supplementary.xsd
rename to src/main/java/wsdls/schema/Common/MHR_CommonTypes_Supplementary.xsd
index 15cb66d..0a995ef 100644
--- a/src/main/java/wsdls/schema/Common/PCEHR_CommonTypes_Supplementary.xsd
+++ b/src/main/java/wsdls/schema/Common/MHR_CommonTypes_Supplementary.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.0 issued 24 April 2012-->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:tns="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xsd:include schemaLocation="PCEHR_CommonTypes.xsd"/>
+	<xsd:include schemaLocation="MHR_CommonTypes.xsd"/>
 	<!-- 
 ============================= ADDRESS TYPES =================================
 -->
diff --git a/src/main/java/wsdls/schema/Common/PCEHR_TemplatesTypes.xsd b/src/main/java/wsdls/schema/Common/MHR_TemplatesTypes.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/Common/PCEHR_TemplatesTypes.xsd
rename to src/main/java/wsdls/schema/Common/MHR_TemplatesTypes.xsd
diff --git a/src/main/java/wsdls/schema/External/PCEHR_DoesPCEHRExist.xsd b/src/main/java/wsdls/schema/External/MHR_DoesMHRExist.xsd
similarity index 93%
rename from src/main/java/wsdls/schema/External/PCEHR_DoesPCEHRExist.xsd
rename to src/main/java/wsdls/schema/External/MHR_DoesMHRExist.xsd
index 5e8f2e9..e7f1d61 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_DoesPCEHRExist.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_DoesMHRExist.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.0.1 issued 17 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
 	<xs:element name="doesPCEHRExist"/>
 	<xs:element name="doesPCEHRExistResponse">
 		<xs:annotation>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GainPCEHRAccess.xsd b/src/main/java/wsdls/schema/External/MHR_GainMHRAccess.xsd
similarity index 97%
rename from src/main/java/wsdls/schema/External/PCEHR_GainPCEHRAccess.xsd
rename to src/main/java/wsdls/schema/External/MHR_GainMHRAccess.xsd
index 3e828bf..df65fb9 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_GainPCEHRAccess.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_GainMHRAccess.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.0.1 issued 17 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
 	<xs:element name="gainPCEHRAccess">
 		<xs:complexType>
 			<xs:sequence>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GetAuditView.xsd b/src/main/java/wsdls/schema/External/MHR_GetAuditView.xsd
similarity index 97%
rename from src/main/java/wsdls/schema/External/PCEHR_GetAuditView.xsd
rename to src/main/java/wsdls/schema/External/MHR_GetAuditView.xsd
index f36039b..79e4ab5 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_GetAuditView.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_GetAuditView.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.1 issued 17 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
 	<xs:element name="getAuditView">
 		<xs:annotation>
 			<xs:documentation>Comment describing your root element</xs:documentation>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GetChangeHistoryView.xsd b/src/main/java/wsdls/schema/External/MHR_GetChangeHistoryView.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/PCEHR_GetChangeHistoryView.xsd
rename to src/main/java/wsdls/schema/External/MHR_GetChangeHistoryView.xsd
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GetIndividualDetailsView.xsd b/src/main/java/wsdls/schema/External/MHR_GetIndividualDetailsView.xsd
similarity index 95%
rename from src/main/java/wsdls/schema/External/PCEHR_GetIndividualDetailsView.xsd
rename to src/main/java/wsdls/schema/External/MHR_GetIndividualDetailsView.xsd
index ce6ee35..d2a7984 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_GetIndividualDetailsView.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_GetIndividualDetailsView.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 2.0.0 issued 5 October 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes_Supplementary.xsd"/>
 	<xs:element name="getIndividualDetailsView"/>
 	<xs:element name="getIndividualDetailsViewResponse">
 		<xs:complexType>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GetRepresentativeList.xsd b/src/main/java/wsdls/schema/External/MHR_GetRepresentativeList.xsd
similarity index 95%
rename from src/main/java/wsdls/schema/External/PCEHR_GetRepresentativeList.xsd
rename to src/main/java/wsdls/schema/External/MHR_GetRepresentativeList.xsd
index cdcfdba..ead648e 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_GetRepresentativeList.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_GetRepresentativeList.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.1 issued 24 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes_Supplementary.xsd"/>
 	<xs:element name="getRepresentativeList"/>
 	<xs:element name="getRepresentativeListResponse">
 		<xs:complexType>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GetTemplate.xsd b/src/main/java/wsdls/schema/External/MHR_GetTemplate.xsd
similarity index 92%
rename from src/main/java/wsdls/schema/External/PCEHR_GetTemplate.xsd
rename to src/main/java/wsdls/schema/External/MHR_GetTemplate.xsd
index c233e63..f11cf02 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_GetTemplate.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_GetTemplate.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.0.1 issued 17 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" xmlns:ns3="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" targetNamespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" schemaLocation="../Common/PCEHR_TemplatesTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" schemaLocation="../Common/MHR_TemplatesTypes.xsd"/>
 	<xs:element name="getTemplate">
 		<xs:complexType>
 			<xs:sequence>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_GetView.xsd b/src/main/java/wsdls/schema/External/MHR_GetView.xsd
similarity index 77%
rename from src/main/java/wsdls/schema/External/PCEHR_GetView.xsd
rename to src/main/java/wsdls/schema/External/MHR_GetView.xsd
index b45ec3b..8a62d77 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_GetView.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_GetView.xsd
@@ -13,9 +13,9 @@
 		xmlns:adv="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/AchievementDiaryView/1.0" 
 	
 	and the associated import, for example:
-		<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/AchievementDiaryView/1.0" schemaLocation="view/PCEHR_AchievementDiaryView.xsd"/> 
+		<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/AchievementDiaryView/1.0" schemaLocation="view/MHR_AchievementDiaryView.xsd"/> 
 
-	modifications also exist in the view/PCEHR_XXXView.xsd 
+	modifications also exist in the view/MHR_XXXView.xsd 
 
 -->
 
@@ -39,17 +39,17 @@ xmlns:hro="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOv
 xmlns:prv="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0"
 >
 
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0" schemaLocation="view/PCEHR_DiagnosticImagingReportView.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0" schemaLocation="view/PCEHR_DiagnosticImagingReportView_Response.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/MedicareOverview/1.0" schemaLocation="view/PCEHR_MedicareOverview.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/ObservationView/1.0" schemaLocation="view/PCEHR_ObservationView.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PrescriptionAndDispenseView/1.0" schemaLocation="view/PCEHR_PrescriptionAndDispenseView.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthCheckScheduleView/1.0" schemaLocation="view/PCEHR_HealthCheckScheduleView.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0" schemaLocation="view/PCEHR_HealthRecordOverview_Response.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0" schemaLocation="view/PCEHR_HealthRecordOverview.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0" schemaLocation="view/PCEHR_PathologyReportView_Response.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0" schemaLocation="view/PCEHR_PathologyReportView.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0" schemaLocation="view/MHR_DiagnosticImagingReportView.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0" schemaLocation="view/MHR_DiagnosticImagingReportView_Response.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/MedicareOverview/1.0" schemaLocation="view/MHR_MedicareOverview.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/ObservationView/1.0" schemaLocation="view/MHR_ObservationView.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PrescriptionAndDispenseView/1.0" schemaLocation="view/MHR_PrescriptionAndDispenseView.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthCheckScheduleView/1.0" schemaLocation="view/MHR_HealthCheckScheduleView.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0" schemaLocation="view/MHR_HealthRecordOverview_Response.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0" schemaLocation="view/MHR_HealthRecordOverview.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0" schemaLocation="view/MHR_PathologyReportView_Response.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0" schemaLocation="view/MHR_PathologyReportView.xsd"/>
 	
 	
 	
diff --git a/src/main/java/wsdls/schema/External/PCEHR_RegisterPCEHR.xsd b/src/main/java/wsdls/schema/External/MHR_RegisterMHR.xsd
similarity index 98%
rename from src/main/java/wsdls/schema/External/PCEHR_RegisterPCEHR.xsd
rename to src/main/java/wsdls/schema/External/MHR_RegisterMHR.xsd
index 38b8ff1..a1ad617 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_RegisterPCEHR.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_RegisterMHR.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 2.0.0 issued 5 November 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes_Supplementary.xsd"/>
 	<xs:element name="registerPCEHR">
 		<xs:complexType>
 			<xs:sequence>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_RemoveDocument.xsd b/src/main/java/wsdls/schema/External/MHR_RemoveDocument.xsd
similarity index 93%
rename from src/main/java/wsdls/schema/External/PCEHR_RemoveDocument.xsd
rename to src/main/java/wsdls/schema/External/MHR_RemoveDocument.xsd
index a71942c..b623aab 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_RemoveDocument.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_RemoveDocument.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.0.1 issued 17 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
 	<xs:element name="removeDocument">
 		<xs:complexType>
 			<xs:sequence>
diff --git a/src/main/java/wsdls/schema/External/PCEHR_SearchTemplate.xsd b/src/main/java/wsdls/schema/External/MHR_SearchTemplate.xsd
similarity index 90%
rename from src/main/java/wsdls/schema/External/PCEHR_SearchTemplate.xsd
rename to src/main/java/wsdls/schema/External/MHR_SearchTemplate.xsd
index b34dea4..52375fa 100644
--- a/src/main/java/wsdls/schema/External/PCEHR_SearchTemplate.xsd
+++ b/src/main/java/wsdls/schema/External/MHR_SearchTemplate.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.0.1 issued 17 April 2012-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" xmlns:ns3="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" targetNamespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/PCEHR_CommonTypes.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" schemaLocation="../Common/PCEHR_TemplatesTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../Common/MHR_CommonTypes.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" schemaLocation="../Common/MHR_TemplatesTypes.xsd"/>
 	<xs:element name="searchTemplate">
 		<xs:complexType>
 			<xs:sequence>
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_DiagnosticImagingReportView.xsd b/src/main/java/wsdls/schema/External/View/MHR_DiagnosticImagingReportView.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_DiagnosticImagingReportView.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_DiagnosticImagingReportView.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_DiagnosticImagingReportView_Response.xsd b/src/main/java/wsdls/schema/External/View/MHR_DiagnosticImagingReportView_Response.xsd
similarity index 95%
rename from src/main/java/wsdls/schema/External/View/PCEHR_DiagnosticImagingReportView_Response.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_DiagnosticImagingReportView_Response.xsd
index 7146cd3..95676d7 100644
--- a/src/main/java/wsdls/schema/External/View/PCEHR_DiagnosticImagingReportView_Response.xsd
+++ b/src/main/java/wsdls/schema/External/View/MHR_DiagnosticImagingReportView_Response.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version issued 30 June 2014-->
 <xs:schema xmlns="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:q3="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/b2b/1.0" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/DiagnosticImagingReportView/1.0" elementFormDefault="qualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" schemaLocation="PCEHR_View_CommonType.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/MHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" schemaLocation="MHR_View_CommonType.xsd"/>
 	
 	<!--  This file was modified by NeHTA 25/8/2014 to change the anonymous complex type to a named the complex type -->
 	
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_HealthCheckScheduleView.xsd b/src/main/java/wsdls/schema/External/View/MHR_HealthCheckScheduleView.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_HealthCheckScheduleView.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_HealthCheckScheduleView.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_HealthRecordOverview.xsd b/src/main/java/wsdls/schema/External/View/MHR_HealthRecordOverview.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_HealthRecordOverview.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_HealthRecordOverview.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_HealthRecordOverview_Response.xsd b/src/main/java/wsdls/schema/External/View/MHR_HealthRecordOverview_Response.xsd
similarity index 98%
rename from src/main/java/wsdls/schema/External/View/PCEHR_HealthRecordOverview_Response.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_HealthRecordOverview_Response.xsd
index 188d37d..4082c24 100644
--- a/src/main/java/wsdls/schema/External/View/PCEHR_HealthRecordOverview_Response.xsd
+++ b/src/main/java/wsdls/schema/External/View/MHR_HealthRecordOverview_Response.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Baseline version issued 14 April 2015-->
 <xs:schema xmlns="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:q3="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/b2b/1.0" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/HealthRecordOverview/1.0" elementFormDefault="qualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" schemaLocation="PCEHR_View_CommonType.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/MHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" schemaLocation="MHR_View_CommonType.xsd"/>
 	
 	<!--  This file was modified by NeHTA 25/8/2014 to change the anonymous complex type to a named the complex type -->
 	
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_MedicareOverview.xsd b/src/main/java/wsdls/schema/External/View/MHR_MedicareOverview.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_MedicareOverview.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_MedicareOverview.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_ObservationView.xsd b/src/main/java/wsdls/schema/External/View/MHR_ObservationView.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_ObservationView.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_ObservationView.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_PathologyReportView.xsd b/src/main/java/wsdls/schema/External/View/MHR_PathologyReportView.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_PathologyReportView.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_PathologyReportView.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_PathologyReportView_Response.xsd b/src/main/java/wsdls/schema/External/View/MHR_PathologyReportView_Response.xsd
similarity index 94%
rename from src/main/java/wsdls/schema/External/View/PCEHR_PathologyReportView_Response.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_PathologyReportView_Response.xsd
index f13bddf..92ec7c2 100644
--- a/src/main/java/wsdls/schema/External/View/PCEHR_PathologyReportView_Response.xsd
+++ b/src/main/java/wsdls/schema/External/View/MHR_PathologyReportView_Response.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version issued 01 July 2014-->
 <xs:schema xmlns="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:q3="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/b2b/1.0" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PathologyReportView/1.0" elementFormDefault="qualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" schemaLocation="PCEHR_View_CommonType.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/MHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" schemaLocation="MHR_View_CommonType.xsd"/>
 	
 	<!--  This file was modified by NeHTA 25/8/2014 to change the anonymous complex type to a named the complex type -->
 	
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_PrescriptionAndDispenseView.xsd b/src/main/java/wsdls/schema/External/View/MHR_PrescriptionAndDispenseView.xsd
similarity index 100%
rename from src/main/java/wsdls/schema/External/View/PCEHR_PrescriptionAndDispenseView.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_PrescriptionAndDispenseView.xsd
diff --git a/src/main/java/wsdls/schema/External/View/PCEHR_View_CommonType.xsd b/src/main/java/wsdls/schema/External/View/MHR_View_CommonType.xsd
similarity index 98%
rename from src/main/java/wsdls/schema/External/View/PCEHR_View_CommonType.xsd
rename to src/main/java/wsdls/schema/External/View/MHR_View_CommonType.xsd
index afb7d41..055d46c 100644
--- a/src/main/java/wsdls/schema/External/View/PCEHR_View_CommonType.xsd
+++ b/src/main/java/wsdls/schema/External/View/MHR_View_CommonType.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 2.0.0 issued 30 June 2014-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/view/ViewCommonType/1.0" elementFormDefault="qualified">
-	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/PCEHR_CommonTypes_Supplementary.xsd"/>
+	<xs:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../Common/MHR_CommonTypes_Supplementary.xsd"/>
 	<xs:complexType name="CodedType">
 		<xs:sequence>
 			<xs:element name="displayName" type="xs:string" minOccurs="0"/>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_DocumentRegistry.wsdl b/src/main/java/wsdls/wsdl/External/B2B_DocumentRegistry.wsdl
index f46260f..41af9e8 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_DocumentRegistry.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_DocumentRegistry.wsdl
@@ -19,7 +19,7 @@
 		code generating toolkits to work properly -->
 		<xsd:schema elementFormDefault="qualified" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0">
 			<!-- Include the message schema -->
-			<xsd:include schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
+			<xsd:include schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
 		</xsd:schema>
 	</types>
 	<message name="RegistryStoredQuery_Message">
diff --git a/src/main/java/wsdls/wsdl/External/B2B_DocumentRepository.wsdl b/src/main/java/wsdls/wsdl/External/B2B_DocumentRepository.wsdl
index 4e963ce..a34e89c 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_DocumentRepository.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_DocumentRepository.wsdl
@@ -9,7 +9,7 @@
 		</xsd:schema>
 		<xsd:schema elementFormDefault="qualified" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0">
 			<!-- Include the message schema -->
-			<xsd:include schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
+			<xsd:include schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
 		</xsd:schema>
 		 <xsd:schema elementFormDefault="qualified" targetNamespace="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0">
 			<!-- Include the message schema -->
diff --git a/src/main/java/wsdls/wsdl/External/B2B_GetAuditViewInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_GetAuditViewInterface.wsdl
index b5eff12..7b85e47 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_GetAuditViewInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_GetAuditViewInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="getAuditView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" schemaLocation="../../schema/External/PCEHR_GetAuditView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" schemaLocation="../../schema/External/MHR_GetAuditView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_GetChangeHistoryViewInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_GetChangeHistoryViewInterface.wsdl
index b7146d9..67b96f7 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_GetChangeHistoryViewInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_GetChangeHistoryViewInterface.wsdl
@@ -3,8 +3,8 @@
 <definitions xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns7="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0" xmlns:ns8="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns1="urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0" xmlns:ns2="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0" name="getChangeHistoryView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1">
 	<types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0" schemaLocation="../../schema/External/PCEHR_GetChangeHistoryView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0" schemaLocation="../../schema/External/MHR_GetChangeHistoryView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_GetIndividualDetailsViewInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_GetIndividualDetailsViewInterface.wsdl
index fcea823..1b18aa8 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_GetIndividualDetailsViewInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_GetIndividualDetailsViewInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" name="getIndividualDetailsView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes_Supplementary.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" schemaLocation="../../schema/External/PCEHR_GetIndividualDetailsView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes_Supplementary.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" schemaLocation="../../schema/External/MHR_GetIndividualDetailsView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_GetRepresentativeListInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_GetRepresentativeListInterface.wsdl
index 788ba3b..af30ebe 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_GetRepresentativeListInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_GetRepresentativeListInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="getRepresentativeList" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" schemaLocation="../../schema/External/PCEHR_GetRepresentativeList.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" schemaLocation="../../schema/External/MHR_GetRepresentativeList.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_GetTemplateInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_GetTemplateInterface.wsdl
index da4f40f..cc554f7 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_GetTemplateInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_GetTemplateInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr="http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns1="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" name="getTemplate" targetNamespace="http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" schemaLocation="../../schema/External/PCEHR_GetTemplate.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" schemaLocation="../../schema/External/MHR_GetTemplate.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_GetViewInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_GetViewInterface.wsdl
index 06f20e2..8ec2270 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_GetViewInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_GetViewInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="getView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0" schemaLocation="../../schema/External/PCEHR_GetView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0" schemaLocation="../../schema/External/MHR_GetView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_PCEHRProfile.wsdl b/src/main/java/wsdls/wsdl/External/B2B_MHRProfile.wsdl
similarity index 97%
rename from src/main/java/wsdls/wsdl/External/B2B_PCEHRProfile.wsdl
rename to src/main/java/wsdls/wsdl/External/B2B_MHRProfile.wsdl
index 3ff99e1..e8e2411 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_PCEHRProfile.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_MHRProfile.wsdl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.1 issued 17 April 2012-->
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" name="PCEHRProfile" targetNamespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1">
-	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" location="B2B_PCEHRProfileInterface.wsdl"/>
+	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" location="B2B_MHRProfileInterface.wsdl"/>
 	<wsdl:binding name="PCEHRProfileServiceSOAP12Binding" type="pcehr_b2b:PCEHRProfilePortType">
 		<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 		<wsp:PolicyReference URI="#AddressingPolicy"/>
diff --git a/src/main/resources/wsdl/B2B_PCEHRProfileInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_MHRProfileInterface.wsdl
similarity index 97%
rename from src/main/resources/wsdl/B2B_PCEHRProfileInterface.wsdl
rename to src/main/java/wsdls/wsdl/External/B2B_MHRProfileInterface.wsdl
index 983699c..a9a63e9 100644
--- a/src/main/resources/wsdl/B2B_PCEHRProfileInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_MHRProfileInterface.wsdl
@@ -3,9 +3,9 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns4="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" xmlns:sig="http://www.w3.org/2000/09/xmldsig#" name="PCEHRProfile" targetNamespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/PCEHR_DoesPCEHRExist.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/PCEHR_GainPCEHRAccess.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/MHR_DoesMHRExist.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/MHR_GainMHRAccess.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_RegisterPCEHR.wsdl b/src/main/java/wsdls/wsdl/External/B2B_RegisterMHR.wsdl
similarity index 97%
rename from src/main/resources/wsdl/B2B_RegisterPCEHR.wsdl
rename to src/main/java/wsdls/wsdl/External/B2B_RegisterMHR.wsdl
index f8e240d..fdd7a8b 100644
--- a/src/main/resources/wsdl/B2B_RegisterPCEHR.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_RegisterMHR.wsdl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 2.0.0 issued 5 October 2012-->
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" name="registerPCEHR" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0">
-	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" location="B2B_RegisterPCEHRInterface.wsdl"/>
+	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" location="B2B_RegisterMHRInterface.wsdl"/>
 	<wsdl:binding name="registerPCEHRServiceSOAP12Binding" type="pcehr:RegisterPCEHRPortType">
 		<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 		<wsp:PolicyReference URI="#AddressingPolicy"/>
diff --git a/src/main/resources/wsdl/B2B_RegisterPCEHRInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_RegisterMHRInterface.wsdl
similarity index 97%
rename from src/main/resources/wsdl/B2B_RegisterPCEHRInterface.wsdl
rename to src/main/java/wsdls/wsdl/External/B2B_RegisterMHRInterface.wsdl
index 4669e13..53425da 100644
--- a/src/main/resources/wsdl/B2B_RegisterPCEHRInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_RegisterMHRInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="RegisterPCEHR" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" schemaLocation="../../schema/External/PCEHR_RegisterPCEHR.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" schemaLocation="../../schema/External/MHR_RegisterMHR.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_RemoveDocumentInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_RemoveDocumentInterface.wsdl
index d644425..2475601 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_RemoveDocumentInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_RemoveDocumentInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="removeDocument" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" schemaLocation="../../schema/External/PCEHR_RemoveDocument.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" schemaLocation="../../schema/External/MHR_RemoveDocument.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_SearchTemplateInterface.wsdl b/src/main/java/wsdls/wsdl/External/B2B_SearchTemplateInterface.wsdl
index 5f9fd7f..b3cca2d 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_SearchTemplateInterface.wsdl
+++ b/src/main/java/wsdls/wsdl/External/B2B_SearchTemplateInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns1="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" name="searchTemplate" targetNamespace="http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" schemaLocation="../../schema/External/PCEHR_SearchTemplate.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" schemaLocation="../../schema/External/MHR_SearchTemplate.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_DocumentRegistry.wsdl b/src/main/resources/wsdl/B2B_DocumentRegistry.wsdl
index f46260f..41af9e8 100644
--- a/src/main/resources/wsdl/B2B_DocumentRegistry.wsdl
+++ b/src/main/resources/wsdl/B2B_DocumentRegistry.wsdl
@@ -19,7 +19,7 @@
 		code generating toolkits to work properly -->
 		<xsd:schema elementFormDefault="qualified" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0">
 			<!-- Include the message schema -->
-			<xsd:include schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
+			<xsd:include schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
 		</xsd:schema>
 	</types>
 	<message name="RegistryStoredQuery_Message">
diff --git a/src/main/resources/wsdl/B2B_DocumentRepository.wsdl b/src/main/resources/wsdl/B2B_DocumentRepository.wsdl
index 4e963ce..a34e89c 100644
--- a/src/main/resources/wsdl/B2B_DocumentRepository.wsdl
+++ b/src/main/resources/wsdl/B2B_DocumentRepository.wsdl
@@ -9,7 +9,7 @@
 		</xsd:schema>
 		<xsd:schema elementFormDefault="qualified" targetNamespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0">
 			<!-- Include the message schema -->
-			<xsd:include schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
+			<xsd:include schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
 		</xsd:schema>
 		 <xsd:schema elementFormDefault="qualified" targetNamespace="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0">
 			<!-- Include the message schema -->
diff --git a/src/main/resources/wsdl/B2B_GetAuditViewInterface.wsdl b/src/main/resources/wsdl/B2B_GetAuditViewInterface.wsdl
index b5eff12..7b85e47 100644
--- a/src/main/resources/wsdl/B2B_GetAuditViewInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_GetAuditViewInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="getAuditView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetAuditView/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" schemaLocation="../../schema/External/PCEHR_GetAuditView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetAuditView/1.1" schemaLocation="../../schema/External/MHR_GetAuditView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_GetChangeHistoryViewInterface.wsdl b/src/main/resources/wsdl/B2B_GetChangeHistoryViewInterface.wsdl
index b7146d9..67b96f7 100644
--- a/src/main/resources/wsdl/B2B_GetChangeHistoryViewInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_GetChangeHistoryViewInterface.wsdl
@@ -3,8 +3,8 @@
 <definitions xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns7="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0" xmlns:ns8="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns1="urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0" xmlns:ns2="urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0" name="getChangeHistoryView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1">
 	<types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/getChangeHistoryView/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0" schemaLocation="../../schema/External/PCEHR_GetChangeHistoryView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetChangeHistoryView/1.0" schemaLocation="../../schema/External/MHR_GetChangeHistoryView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</types>
diff --git a/src/main/resources/wsdl/B2B_GetIndividualDetailsViewInterface.wsdl b/src/main/resources/wsdl/B2B_GetIndividualDetailsViewInterface.wsdl
index fcea823..1b18aa8 100644
--- a/src/main/resources/wsdl/B2B_GetIndividualDetailsViewInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_GetIndividualDetailsViewInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" name="getIndividualDetailsView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetIndividualDetailsView/2.0" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes_Supplementary.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" schemaLocation="../../schema/External/PCEHR_GetIndividualDetailsView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes_Supplementary.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetIndividualDetailsView/2.0" schemaLocation="../../schema/External/MHR_GetIndividualDetailsView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_GetRepresentativeListInterface.wsdl b/src/main/resources/wsdl/B2B_GetRepresentativeListInterface.wsdl
index 788ba3b..af30ebe 100644
--- a/src/main/resources/wsdl/B2B_GetRepresentativeListInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_GetRepresentativeListInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="getRepresentativeList" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetRepresentativeList/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" schemaLocation="../../schema/External/PCEHR_GetRepresentativeList.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetRepresentativeList/1.1" schemaLocation="../../schema/External/MHR_GetRepresentativeList.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_GetTemplateInterface.wsdl b/src/main/resources/wsdl/B2B_GetTemplateInterface.wsdl
index da4f40f..cc554f7 100644
--- a/src/main/resources/wsdl/B2B_GetTemplateInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_GetTemplateInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr="http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns1="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" name="getTemplate" targetNamespace="http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/tplt/svc/GetTemplate/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" schemaLocation="../../schema/External/PCEHR_GetTemplate.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/GetTemplate/1.0" schemaLocation="../../schema/External/MHR_GetTemplate.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_GetViewInterface.wsdl b/src/main/resources/wsdl/B2B_GetViewInterface.wsdl
index 06f20e2..8ec2270 100644
--- a/src/main/resources/wsdl/B2B_GetViewInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_GetViewInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="getView" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/GetView/1.0" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0" schemaLocation="../../schema/External/PCEHR_GetView.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/GetView/1.0" schemaLocation="../../schema/External/MHR_GetView.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_PCEHRProfile.wsdl b/src/main/resources/wsdl/B2B_MHRProfile.wsdl
similarity index 97%
rename from src/main/resources/wsdl/B2B_PCEHRProfile.wsdl
rename to src/main/resources/wsdl/B2B_MHRProfile.wsdl
index 3ff99e1..e8e2411 100644
--- a/src/main/resources/wsdl/B2B_PCEHRProfile.wsdl
+++ b/src/main/resources/wsdl/B2B_MHRProfile.wsdl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 1.1 issued 17 April 2012-->
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" name="PCEHRProfile" targetNamespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1">
-	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" location="B2B_PCEHRProfileInterface.wsdl"/>
+	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" location="B2B_MHRProfileInterface.wsdl"/>
 	<wsdl:binding name="PCEHRProfileServiceSOAP12Binding" type="pcehr_b2b:PCEHRProfilePortType">
 		<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 		<wsp:PolicyReference URI="#AddressingPolicy"/>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_PCEHRProfileInterface.wsdl b/src/main/resources/wsdl/B2B_MHRProfileInterface.wsdl
similarity index 97%
rename from src/main/java/wsdls/wsdl/External/B2B_PCEHRProfileInterface.wsdl
rename to src/main/resources/wsdl/B2B_MHRProfileInterface.wsdl
index 983699c..a9a63e9 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_PCEHRProfileInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_MHRProfileInterface.wsdl
@@ -3,9 +3,9 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns4="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" xmlns:sig="http://www.w3.org/2000/09/xmldsig#" name="PCEHRProfile" targetNamespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/b2b/svc/PCEHRProfile/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/PCEHR_DoesPCEHRExist.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/PCEHR_GainPCEHRAccess.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/MHR_DoesMHRExist.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/PCEHRProfile/1.0" schemaLocation="../../schema/External/MHR_GainMHRAccess.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_RegisterPCEHR.wsdl b/src/main/resources/wsdl/B2B_RegisterMHR.wsdl
similarity index 97%
rename from src/main/java/wsdls/wsdl/External/B2B_RegisterPCEHR.wsdl
rename to src/main/resources/wsdl/B2B_RegisterMHR.wsdl
index f8e240d..fdd7a8b 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_RegisterPCEHR.wsdl
+++ b/src/main/resources/wsdl/B2B_RegisterMHR.wsdl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Version 2.0.0 issued 5 October 2012-->
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" name="registerPCEHR" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0">
-	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" location="B2B_RegisterPCEHRInterface.wsdl"/>
+	<wsdl:import namespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" location="B2B_RegisterMHRInterface.wsdl"/>
 	<wsdl:binding name="registerPCEHRServiceSOAP12Binding" type="pcehr:RegisterPCEHRPortType">
 		<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 		<wsp:PolicyReference URI="#AddressingPolicy"/>
diff --git a/src/main/java/wsdls/wsdl/External/B2B_RegisterPCEHRInterface.wsdl b/src/main/resources/wsdl/B2B_RegisterMHRInterface.wsdl
similarity index 97%
rename from src/main/java/wsdls/wsdl/External/B2B_RegisterPCEHRInterface.wsdl
rename to src/main/resources/wsdl/B2B_RegisterMHRInterface.wsdl
index 4669e13..53425da 100644
--- a/src/main/java/wsdls/wsdl/External/B2B_RegisterPCEHRInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_RegisterMHRInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="RegisterPCEHR" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RegisterPCEHR/2.0" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" schemaLocation="../../schema/External/PCEHR_RegisterPCEHR.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RegisterPCEHR/2.0" schemaLocation="../../schema/External/MHR_RegisterMHR.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_RemoveDocumentInterface.wsdl b/src/main/resources/wsdl/B2B_RemoveDocumentInterface.wsdl
index d644425..2475601 100644
--- a/src/main/resources/wsdl/B2B_RemoveDocumentInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_RemoveDocumentInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" name="removeDocument" targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/pcehr/svc/RemoveDocument/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" schemaLocation="../../schema/External/PCEHR_RemoveDocument.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/interfaces/RemoveDocument/1.0" schemaLocation="../../schema/External/MHR_RemoveDocument.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/main/resources/wsdl/B2B_SearchTemplateInterface.wsdl b/src/main/resources/wsdl/B2B_SearchTemplateInterface.wsdl
index 5f9fd7f..b3cca2d 100644
--- a/src/main/resources/wsdl/B2B_SearchTemplateInterface.wsdl
+++ b/src/main/resources/wsdl/B2B_SearchTemplateInterface.wsdl
@@ -3,8 +3,8 @@
 <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pcehr="http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1" xmlns:pcehr_b2b="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" xmlns:ns2="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" xmlns:tns="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:ns="http://www.w3.org/2000/09/xmldsig#" xmlns:ns1="http://ns.electronichealth.net.au/tplt/xsd/common/TemplatesCoreElements/1.0" name="searchTemplate" targetNamespace="http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1">
 	<wsdl:types>
 		<xsd:schema targetNamespace="http://ns.electronichealth.net.au/tplt/svc/SearchTemplate/1.1" elementFormDefault="qualified">
-			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/PCEHR_CommonTypes.xsd"/>
-			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" schemaLocation="../../schema/External/PCEHR_SearchTemplate.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/pcehr/xsd/common/CommonCoreElements/1.0" schemaLocation="../../schema/Common/MHR_CommonTypes.xsd"/>
+			<xsd:import namespace="http://ns.electronichealth.net.au/tplt/xsd/interfaces/SearchTemplate/1.0" schemaLocation="../../schema/External/MHR_SearchTemplate.xsd"/>
 			<xsd:import namespace="http://ns.electronichealth.net.au/wsp/xsd/StandardError/2010" schemaLocation="../../schema/Common/wsp-StandardError-2010.xsd"/>
 		</xsd:schema>
 	</wsdl:types>
diff --git a/src/test/java/au/gov/nehta/pcehrwsdl/GeneratedWsdlBindingsTest.java b/src/test/java/au/gov/nehta/mhrwsdl/GeneratedWsdlBindingsTest.java
similarity index 99%
rename from src/test/java/au/gov/nehta/pcehrwsdl/GeneratedWsdlBindingsTest.java
rename to src/test/java/au/gov/nehta/mhrwsdl/GeneratedWsdlBindingsTest.java
index 1d575eb..772310f 100644
--- a/src/test/java/au/gov/nehta/pcehrwsdl/GeneratedWsdlBindingsTest.java
+++ b/src/test/java/au/gov/nehta/mhrwsdl/GeneratedWsdlBindingsTest.java
@@ -1,4 +1,4 @@
-package au.gov.nehta.pcehrwsdl;
+package au.gov.nehta.mhrwsdl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,7 +34,7 @@ public class GeneratedWsdlBindingsTest {
         "au.net.electronichealth",
         "ihe.iti",
         "oasis.names.tc",
-        "pcehr_override.org.w3"
+        "mhr_override.org.w3"
     );
 
     @Test
diff --git a/src/test/java/au/gov/nehta/pcehrwsdl/JavaxStackTest.java b/src/test/java/au/gov/nehta/mhrwsdl/JavaxStackTest.java
similarity index 98%
rename from src/test/java/au/gov/nehta/pcehrwsdl/JavaxStackTest.java
rename to src/test/java/au/gov/nehta/mhrwsdl/JavaxStackTest.java
index 65a172b..fe7db6d 100644
--- a/src/test/java/au/gov/nehta/pcehrwsdl/JavaxStackTest.java
+++ b/src/test/java/au/gov/nehta/mhrwsdl/JavaxStackTest.java
@@ -1,4 +1,4 @@
-package au.gov.nehta.pcehrwsdl;
+package au.gov.nehta.mhrwsdl;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/au/gov/nehta/pcehrwsdl/PcehrCompiledWsdlArtifactTest.java b/src/test/java/au/gov/nehta/mhrwsdl/MhrWsdlArtifactTest.java
similarity index 96%
rename from src/test/java/au/gov/nehta/pcehrwsdl/PcehrCompiledWsdlArtifactTest.java
rename to src/test/java/au/gov/nehta/mhrwsdl/MhrWsdlArtifactTest.java
index 2c5211b..7068b04 100644
--- a/src/test/java/au/gov/nehta/pcehrwsdl/PcehrCompiledWsdlArtifactTest.java
+++ b/src/test/java/au/gov/nehta/mhrwsdl/MhrWsdlArtifactTest.java
@@ -1,4 +1,4 @@
-package au.gov.nehta.pcehrwsdl;
+package au.gov.nehta.mhrwsdl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -16,7 +16,7 @@
 /**
  * Offline checks for packaged WSDL and JAX-WS {@link WebServiceClient} stubs only.
  */
-public class PcehrCompiledWsdlArtifactTest {
+public class MhrWsdlArtifactTest {
 
     private static final List<String> PRIMARY_SERVICE_WSDL = Arrays.asList(
         "wsdl/B2B_DocumentRegistry.wsdl",
@@ -27,8 +27,8 @@ public class PcehrCompiledWsdlArtifactTest {
         "wsdl/B2B_GetRepresentativeList.wsdl",
         "wsdl/B2B_GetTemplate.wsdl",
         "wsdl/B2B_GetView.wsdl",
-        "wsdl/B2B_PCEHRProfile.wsdl",
-        "wsdl/B2B_RegisterPCEHR.wsdl",
+        "wsdl/B2B_MHRProfile.wsdl",
+        "wsdl/B2B_RegisterMHR.wsdl",
         "wsdl/B2B_RemoveDocument.wsdl",
         "wsdl/B2B_SearchTemplate.wsdl"
     );
diff --git a/src/test/java/au/gov/nehta/mhrwsdl/WsdlStubContractTest.java b/src/test/java/au/gov/nehta/mhrwsdl/WsdlStubContractTest.java
new file mode 100644
index 0000000..10b133e
--- /dev/null
+++ b/src/test/java/au/gov/nehta/mhrwsdl/WsdlStubContractTest.java
@@ -0,0 +1,349 @@
+package au.gov.nehta.mhrwsdl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.ws.Action;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Offline contract: packaged WSDL service/port/operation/header names match
+ * generated stubs.
+ */
+public class WsdlStubContractTest {
+
+    private static final String WSDL_NS = "http://schemas.xmlsoap.org/wsdl/";
+
+    @Test
+    public void twelveServiceStubsMatchPackagedWsdl() throws Exception {
+        List<Class<?>> stubs = serviceStubs();
+        assertEquals(12, stubs.size());
+        for (Class<?> stub : stubs) {
+            assertStubMatchesWsdl(stub);
+        }
+    }
+
+    private static void assertStubMatchesWsdl(Class<?> stub) throws Exception {
+        WebServiceClient client = stub.getAnnotation(WebServiceClient.class);
+        assertNotNull(stub.getName(), client);
+
+        URL wsdlUrl = resolveWsdl(stub, client.wsdlLocation());
+        assertNotNull(stub.getName() + " wsdlLocation=" + client.wsdlLocation(), wsdlUrl);
+
+        List<Document> docs = loadWsdlGraph(wsdlUrl);
+        Document root = docs.get(0);
+        Element definitions = root.getDocumentElement();
+        assertEquals(stub.getName() + " targetNamespace", client.targetNamespace(),
+                attr(definitions, "targetNamespace"));
+
+        Element service = namedChild(docs, "service", client.name());
+        assertNotNull(stub.getName() + " missing wsdl:service " + client.name(), service);
+
+        Set<String> portNames = new LinkedHashSet<String>();
+        Class<?> portType = null;
+        for (Method method : stub.getDeclaredMethods()) {
+            WebEndpoint endpoint = method.getAnnotation(WebEndpoint.class);
+            if (endpoint == null) {
+                continue;
+            }
+            portNames.add(endpoint.name());
+            if (portType == null && method.getParameterTypes().length == 0
+                    && !Service.class.equals(method.getReturnType())) {
+                portType = method.getReturnType();
+            }
+        }
+        assertFalse(stub.getName() + " has no @WebEndpoint", portNames.isEmpty());
+        assertNotNull(stub.getName() + " port interface", portType);
+
+        for (String portName : portNames) {
+            assertNotNull(stub.getName() + " missing wsdl:port " + portName,
+                    namedChild(children(service, "port"), portName));
+        }
+
+        assertPortTypeMatchesWsdl(stub.getName(), portType, docs);
+    }
+
+    private static void assertPortTypeMatchesWsdl(String stubName, Class<?> portType, List<Document> docs)
+            throws Exception {
+        WebService webService = portType.getAnnotation(WebService.class);
+        assertNotNull(stubName + " " + portType.getName(), webService);
+
+        Element wsdlPortType = portTypeInNamespace(docs, webService.targetNamespace(), webService.name());
+        assertNotNull(stubName + " missing wsdl:portType " + webService.name()
+                + " ns=" + webService.targetNamespace(), wsdlPortType);
+
+        Set<String> wsdlOps = new LinkedHashSet<String>();
+        Map<String, Element> wsdlOpByName = new LinkedHashMap<String, Element>();
+        for (Element operation : children(wsdlPortType, "operation")) {
+            String name = attr(operation, "name");
+            wsdlOps.add(name);
+            wsdlOpByName.put(name, operation);
+        }
+
+        Set<String> javaOps = new LinkedHashSet<String>();
+        for (Method method : portType.getDeclaredMethods()) {
+            WebMethod webMethod = method.getAnnotation(WebMethod.class);
+            if (webMethod == null) {
+                continue;
+            }
+            String opName = webMethod.operationName();
+            if (opName == null || opName.isEmpty()) {
+                opName = method.getName();
+            }
+            assertTrue(stubName + " " + portType.getSimpleName() + "." + method.getName()
+                    + " operation " + opName + " is not in WSDL portType " + webService.name()
+                    + " ops=" + wsdlOps, wsdlOps.contains(opName));
+            javaOps.add(opName);
+
+            Element wsdlOp = wsdlOpByName.get(opName);
+            Action action = method.getAnnotation(Action.class);
+            if (action != null && wsdlOp != null) {
+                Element input = firstChild(wsdlOp, "input");
+                Element output = firstChild(wsdlOp, "output");
+                if (input != null && action.input() != null && !action.input().isEmpty()) {
+                    String wsdlAction = addressingAction(input);
+                    if (wsdlAction != null && !wsdlAction.isEmpty()) {
+                        assertEquals(stubName + " " + opName + " input Action", wsdlAction, action.input());
+                    }
+                }
+                if (output != null && action.output() != null && !action.output().isEmpty()) {
+                    String wsdlAction = addressingAction(output);
+                    if (wsdlAction != null && !wsdlAction.isEmpty()) {
+                        assertEquals(stubName + " " + opName + " output Action", wsdlAction, action.output());
+                    }
+                }
+            }
+
+            Set<String> headerParts = new LinkedHashSet<String>();
+            for (WebParam param : collectWebParams(method)) {
+                if (param.header()) {
+                    String part = param.partName();
+                    if (part == null || part.isEmpty()) {
+                        part = param.name();
+                    }
+                    headerParts.add(part);
+                }
+            }
+            assertTrue(stubName + " " + opName + " missing PCEHRHeader SOAP header param",
+                    headerParts.contains("PCEHRHeader"));
+        }
+
+        assertEquals(stubName + " " + webService.name() + " operation set", wsdlOps, javaOps);
+    }
+
+    private static WebParam[] collectWebParams(Method method) {
+        java.lang.annotation.Annotation[][] all = method.getParameterAnnotations();
+        List<WebParam> params = new ArrayList<WebParam>();
+        for (java.lang.annotation.Annotation[] perArg : all) {
+            for (java.lang.annotation.Annotation annotation : perArg) {
+                if (annotation instanceof WebParam) {
+                    params.add((WebParam) annotation);
+                }
+            }
+        }
+        return params.toArray(new WebParam[params.size()]);
+    }
+
+    private static String addressingAction(Element messageRef) {
+        String value = messageRef.getAttributeNS("http://www.w3.org/2007/05/addressing/metadata", "Action");
+        if (value == null || value.isEmpty()) {
+            value = messageRef.getAttributeNS("http://www.w3.org/2006/05/addressing/wsdl", "Action");
+        }
+        if (value == null || value.isEmpty()) {
+            value = attr(messageRef, "Action");
+        }
+        return value;
+    }
+
+    private static URL resolveWsdl(Class<?> stub, String location) {
+        URL url = stub.getResource(location);
+        if (url == null) {
+            url = Thread.currentThread().getContextClassLoader().getResource(location);
+        }
+        return url;
+    }
+
+    private static List<Document> loadWsdlGraph(URL start) throws Exception {
+        List<Document> docs = new ArrayList<Document>();
+        Set<String> seen = new LinkedHashSet<String>();
+        loadWsdlGraph(start, docs, seen);
+        return docs;
+    }
+
+    private static void loadWsdlGraph(URL url, List<Document> docs, Set<String> seen) throws Exception {
+        String key = url.toExternalForm();
+        if (!seen.add(key)) {
+            return;
+        }
+        Document document = parseXml(url);
+        docs.add(document);
+        Element definitions = document.getDocumentElement();
+        for (Element imported : children(definitions, "import")) {
+            String location = attr(imported, "location");
+            if (location == null || location.isEmpty()) {
+                continue;
+            }
+            URL next = new URL(url, location);
+            if ("file".equals(next.getProtocol()) && !new File(next.toURI()).isFile()) {
+                String name = location;
+                int slash = Math.max(location.lastIndexOf('/'), location.lastIndexOf('\\'));
+                if (slash >= 0) {
+                    name = location.substring(slash + 1);
+                }
+                URL classpath = Thread.currentThread().getContextClassLoader().getResource("wsdl/" + name);
+                assertNotNull("wsdl import not on classpath: " + location, classpath);
+                next = classpath;
+            }
+            loadWsdlGraph(next, docs, seen);
+        }
+    }
+
+    private static Document parseXml(URL url) throws Exception {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        factory.setExpandEntityReferences(false);
+        try {
+            factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        } catch (Exception ignored) {
+            // parser may not support the feature
+        }
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        InputStream stream = url.openStream();
+        try {
+            return builder.parse(stream);
+        } finally {
+            stream.close();
+        }
+    }
+
+    private static Element portTypeInNamespace(List<Document> docs, String namespace, String name) {
+        for (Document document : docs) {
+            Element definitions = document.getDocumentElement();
+            if (!namespace.equals(attr(definitions, "targetNamespace"))) {
+                continue;
+            }
+            Element found = namedChild(children(definitions, "portType"), name);
+            if (found != null) {
+                return found;
+            }
+        }
+        return null;
+    }
+
+    private static Element namedChild(List<Document> docs, String localName, String name) {
+        for (Document document : docs) {
+            Element found = namedChild(children(document.getDocumentElement(), localName), name);
+            if (found != null) {
+                return found;
+            }
+        }
+        return null;
+    }
+
+    private static Element namedChild(List<Element> elements, String name) {
+        for (Element element : elements) {
+            if (name.equals(attr(element, "name"))) {
+                return element;
+            }
+        }
+        return null;
+    }
+
+    private static Element firstChild(Element parent, String localName) {
+        List<Element> found = children(parent, localName);
+        return found.isEmpty() ? null : found.get(0);
+    }
+
+    private static List<Element> children(Element parent, String localName) {
+        List<Element> found = new ArrayList<Element>();
+        for (Node node = parent.getFirstChild(); node != null; node = node.getNextSibling()) {
+            if (node.getNodeType() != Node.ELEMENT_NODE) {
+                continue;
+            }
+            Element element = (Element) node;
+            if (!localName.equals(element.getLocalName())) {
+                continue;
+            }
+            String ns = element.getNamespaceURI();
+            if (ns == null || WSDL_NS.equals(ns)) {
+                found.add(element);
+            }
+        }
+        return found;
+    }
+
+    private static String attr(Element element, String name) {
+        String value = element.getAttribute(name);
+        return value == null ? "" : value;
+    }
+
+    private static List<Class<?>> serviceStubs() throws Exception {
+        List<Class<?>> stubs = new ArrayList<Class<?>>();
+        for (Class<?> type : classesInPackage("au.net.electronichealth")) {
+            if (type.getAnnotation(WebServiceClient.class) != null) {
+                stubs.add(type);
+            }
+        }
+        for (Class<?> type : classesInPackage("ihe.iti")) {
+            if (type.getAnnotation(WebServiceClient.class) != null) {
+                stubs.add(type);
+            }
+        }
+        return stubs;
+    }
+
+    private static List<Class<?>> classesInPackage(String packageName) throws Exception {
+        String path = packageName.replace('.', '/');
+        Enumeration<URL> resources = Thread.currentThread().getContextClassLoader().getResources(path);
+        List<Class<?>> classes = new ArrayList<Class<?>>();
+        while (resources.hasMoreElements()) {
+            URL resource = resources.nextElement();
+            if ("file".equals(resource.getProtocol())) {
+                addClasses(new File(URLDecoder.decode(resource.getFile(), "UTF-8")), packageName, classes);
+            }
+        }
+        return classes;
+    }
+
+    private static void addClasses(File directory, String packageName, List<Class<?>> classes) throws Exception {
+        File[] files = directory.listFiles();
+        if (files == null) {
+            return;
+        }
+        for (File file : files) {
+            if (file.isDirectory()) {
+                addClasses(file, packageName + "." + file.getName(), classes);
+            } else if (file.getName().endsWith(".class")
+                    && !file.getName().contains("$")
+                    && !"package-info.class".equals(file.getName())) {
+                String className = packageName + "." + file.getName().substring(0, file.getName().length() - 6);
+                classes.add(Class.forName(className));
+            }
+        }
+    }
+}