From 75c0c25d7b08de83b03e5660d63f07d7053d7bb7 Mon Sep 17 00:00:00 2001
From: Tadgh <garygrantgraham@gmail.com>
Date: Wed, 18 Nov 2020 19:50:00 -0500
Subject: [PATCH] remove references to EMPI

---
 .../ca/uhn/fhir/interceptor/api/Pointcut.java |   8 +-
 hapi-fhir-bom/pom.xml                         |   4 +-
 .../hapi/fhir/docs/server_jpa_empi/empi.md    |   2 +-
 .../fhir/docs/server_jpa_empi/empi_eid.md     |   6 +-
 .../docs/server_jpa_empi/empi_operations.md   |   2 +-
 hapi-fhir-jacoco/pom.xml                      |   4 +-
 hapi-fhir-jpaserver-base/pom.xml              |   2 +-
 .../ca/uhn/fhir/jpa/config/BaseConfig.java    |   5 +-
 .../{IEmpiLinkDao.java => IMdmLinkDao.java}   |  12 +-
 .../MdmLinkDeleteSvc.java}                    |  23 +-
 .../entity/{EmpiLink.java => MdmLink.java}    | 103 ++---
 hapi-fhir-jpaserver-empi/pom.xml              |   4 +-
 .../Link Service.puml                         |  26 --
 .../jpa/empi/config/EmpiConsumerConfig.java   | 240 ------------
 .../jpa/empi/config/EmpiSubmitterConfig.java  |  76 ----
 .../uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvc.java | 362 ------------------
 .../fhir/jpa/empi/svc/EmpiClearSvcImpl.java   |  79 ----
 .../jpa/empi/svc/EmpiControllerSvcImpl.java   | 100 -----
 .../fhir/jpa/empi/svc/EmpiLinkSvcImpl.java    | 191 ---------
 .../fhir/jpa/empi/svc/EmpiMatchLinkSvc.java   | 165 --------
 .../broker/MdmMessageHandler.java}            |  76 ++--
 .../broker/MdmQueueConsumerLoader.java}       |  42 +-
 .../jpa/mdm/config/MdmConsumerConfig.java     | 240 ++++++++++++
 .../config/MdmLoader.java}                    |  35 +-
 .../config/MdmSearchParameterLoader.java}     |  46 +--
 .../jpa/mdm/config/MdmSubmitterConfig.java    |  76 ++++
 .../config/MdmSubscriptionLoader.java}        |  64 ++--
 .../uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java   | 339 ++++++++++++++++
 .../dao/MdmLinkFactory.java}                  |  22 +-
 .../interceptor/IMdmStorageInterceptor.java}  |   4 +-
 .../interceptor/MdmStorageInterceptor.java}   | 103 ++---
 .../MdmSubmitterInterceptorLoader.java}       |  20 +-
 .../svc/GoldenResourceMergerSvcImpl.java      |  80 ++--
 .../svc/MdmChannelSubmitterSvcImpl.java}      |  32 +-
 .../uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java |  79 ++++
 .../jpa/mdm/svc/MdmControllerSvcImpl.java     | 100 +++++
 .../svc/MdmEidUpdateService.java}             |  94 ++---
 .../svc/MdmGoldenResourceDeletingSvc.java}    |  10 +-
 .../svc/MdmLinkQuerySvcImpl.java}             |  56 +--
 .../uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java  | 143 +++++++
 .../svc/MdmLinkUpdaterSvcImpl.java}           | 101 +++--
 .../svc/MdmMatchFinderSvcImpl.java}           |  20 +-
 .../uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java | 165 ++++++++
 .../svc/MdmResourceDaoSvc.java}               |  18 +-
 .../svc/MdmResourceFilteringSvc.java}         |  40 +-
 .../svc/MdmSearchParamSvc.java}               |   4 +-
 .../svc/MdmSubmitSvcImpl.java}                |  62 +--
 .../svc/candidate/BaseCandidateFinder.java    |   6 +-
 .../svc/candidate/CandidateList.java          |   2 +-
 .../svc/candidate/CandidateStrategyEnum.java  |   8 +-
 .../svc/candidate/FindCandidateByEidSvc.java  |  20 +-
 .../svc/candidate/FindCandidateByLinkSvc.java |  14 +-
 .../candidate/FindCandidateByScoreSvc.java    |  47 ++-
 .../MatchedSourceResourceCandidate.java       |  22 +-
 ...MdmCandidateSearchCriteriaBuilderSvc.java} |  14 +-
 .../svc/candidate/MdmCandidateSearchSvc.java} |  46 +--
 .../MdmGoldenResourceFindingSvc.java}         |  14 +-
 .../fhir/jpa/empi/dao/EmpiLinkDaoSvcTest.java |  55 ---
 .../fhir/jpa/empi/entity/EmpiEnumTest.java    |  20 -
 .../fhir/jpa/empi/helper/EmpiLinkHelper.java  |  31 --
 .../jpa/empi/provider/BaseProviderR4Test.java |  53 ---
 .../BaseMdmR4Test.java}                       | 166 ++++----
 .../config/BaseTestMdmConfig.java}            |  20 +-
 .../config/TestMdmConfigR4.java}              |   4 +-
 .../fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java   |  55 +++
 .../uhn/fhir/jpa/mdm/entity/MdmEnumTest.java  |  20 +
 .../helper/BaseMdmHelper.java}                |  38 +-
 .../helper/MdmHelperConfig.java}              |  22 +-
 .../helper/MdmHelperR4.java}                  |  18 +-
 .../fhir/jpa/mdm/helper/MdmLinkHelper.java    |  31 ++
 .../interceptor/MdmExpungeTest.java}          |  35 +-
 .../interceptor/MdmStorageInterceptorIT.java} | 166 ++++----
 .../matcher/BaseSourceResourceMatcher.java    |  43 +--
 .../jpa/{empi => mdm}/matcher/IsLinkedTo.java |  12 +-
 .../matcher/IsMatchedToAPerson.java           |  18 +-
 .../matcher/IsPossibleDuplicateOf.java        |  26 +-
 .../matcher/IsPossibleLinkedTo.java           |  12 +-
 .../matcher/IsPossibleMatchWith.java          |  22 +-
 .../matcher/IsSameSourceResourceAs.java       |  12 +-
 .../provider/BaseLinkR4Test.java              |  30 +-
 .../jpa/mdm/provider/BaseProviderR4Test.java  |  53 +++
 .../provider/MdmProviderBatchR4Test.java}     |  48 +--
 .../provider/MdmProviderClearLinkR4Test.java} |  34 +-
 .../provider/MdmProviderMatchR4Test.java}     |  29 +-
 .../MdmProviderMergePersonsR4Test.java}       |  49 ++-
 .../provider/MdmProviderQueryLinkR4Test.java} |  40 +-
 .../MdmProviderUpdateLinkR4Test.java}         |  66 ++--
 .../searchparam/SearchParameterTest.java      |   8 +-
 .../svc/EmpiLinkUpdaterSvcImplTest.java       |   6 +-
 .../svc/MdmBatchSvcImplTest.java}             |  38 +-
 ...andidateSearchCriteriaBuilderSvcTest.java} |  36 +-
 .../svc/MdmCandidateSearchSvcTest.java}       |  16 +-
 .../svc/MdmLinkSvcTest.java}                  |  81 ++--
 .../MdmMatchLinkSvcMultipleEidModeTest.java}  |  44 +--
 .../svc/MdmMatchLinkSvcTest.java}             |  96 ++---
 .../svc/MdmPersonMergerSvcTest.java}          | 206 +++++-----
 .../svc/MdmResourceDaoSvcTest.java}           |  16 +-
 .../svc/MdmResourceFilteringSvcMockTest.java} |  23 +-
 .../svc/MdmResourceFilteringSvcTest.java}     |  12 +-
 .../tasks/HapiFhirJpaMigrationTasks.java      |   5 +-
 hapi-fhir-server-empi/pom.xml                 |   2 +-
 .../uhn/fhir/empi/api/EmpiMatchOutcome.java   | 160 --------
 .../api/IGoldenResourceMergerSvc.java         |   4 +-
 .../api/IMdmChannelSubmitterSvc.java}         |  10 +-
 .../api/IMdmControllerSvc.java}               |  19 +-
 .../api/IMdmExpungeSvc.java}                  |  14 +-
 .../api/IMdmLinkQuerySvc.java}                |  10 +-
 .../api/IMdmLinkSvc.java}                     |  14 +-
 .../api/IMdmLinkUpdaterSvc.java}              |   8 +-
 .../api/IMdmMatchFinderSvc.java}              |   6 +-
 .../api/IMdmRuleValidator.java}               |   8 +-
 .../api/IMdmSettings.java}                    |  18 +-
 .../api/IMdmSubmitSvc.java}                   |  40 +-
 .../fhir/{empi => mdm}/api/MatchedTarget.java |   8 +-
 .../api/MdmConstants.java}                    |  12 +-
 .../api/MdmLinkJson.java}                     |  34 +-
 .../api/MdmLinkSourceEnum.java}               |   4 +-
 .../api/MdmMatchEvaluation.java}              |  10 +-
 .../ca/uhn/fhir/mdm/api/MdmMatchOutcome.java  | 160 ++++++++
 .../api/MdmMatchResultEnum.java}              |   4 +-
 .../ca/uhn/fhir/{empi => mdm}/log/Logs.java   |   8 +-
 .../{empi => mdm}/model/CanonicalEID.java     |   2 +-
 .../CanonicalIdentityAssuranceLevel.java      |   2 +-
 .../model/MdmTransactionContext.java          |   4 +-
 .../provider/BaseMdmProvider.java}            |  34 +-
 .../provider/MdmControllerHelper.java}        |  26 +-
 .../provider/MdmControllerUtil.java}          |  16 +-
 .../provider/MdmProviderDstu3.java}           |  74 ++--
 .../provider/MdmProviderLoader.java}          |  26 +-
 .../provider/MdmProviderR4.java}              |  66 ++--
 .../rules/config/MdmRuleValidator.java}       |  72 ++--
 .../rules/config/MdmSettings.java}            |  44 +--
 .../rules/json/MdmFieldMatchJson.java}        |  32 +-
 .../rules/json/MdmFilterSearchParamJson.java} |  12 +-
 .../rules/json/MdmMatcherJson.java}           |  16 +-
 .../json/MdmResourceSearchParamJson.java}     |   8 +-
 .../rules/json/MdmRulesJson.java}             |  50 +--
 .../rules/json/MdmSimilarityJson.java}        |  20 +-
 .../rules/json/VectorMatchResultMap.java      |  34 +-
 .../rules/matcher/BaseHapiStringMetric.java   |   2 +-
 .../rules/matcher/HapiDateMatcher.java        |   4 +-
 .../rules/matcher/HapiDateMatcherDstu3.java   |   2 +-
 .../rules/matcher/HapiDateMatcherR4.java      |   2 +-
 .../rules/matcher/HapiStringMatcher.java      |   8 +-
 .../rules/matcher/IMdmFieldMatcher.java}      |   4 +-
 .../rules/matcher/IMdmStringMatcher.java}     |   4 +-
 .../rules/matcher/IdentifierMatcher.java      |   8 +-
 .../rules/matcher/MdmMatcherEnum.java}        |  12 +-
 .../matcher/MdmPersonNameMatchModeEnum.java}  |   4 +-
 .../rules/matcher/NameMatcher.java            |  12 +-
 .../rules/matcher/PhoneticEncoderMatcher.java |   4 +-
 .../rules/matcher/SubstringStringMatcher.java |   4 +-
 .../similarity/HapiStringSimilarity.java      |   6 +-
 .../similarity/IMdmFieldSimilarity.java}      |   4 +-
 .../rules/similarity/MdmSimilarityEnum.java}  |  16 +-
 .../rules/svc/MdmResourceFieldMatcher.java}   |  46 +--
 .../rules/svc/MdmResourceMatcherSvc.java}     |  72 ++--
 .../util/AssuranceLevelUtil.java              |  14 +-
 .../util/CanonicalIdentifier.java             |   2 +-
 .../fhir/{empi => mdm}/util/EIDHelper.java    |  20 +-
 .../util/GoldenResourceHelper.java}           |  38 +-
 .../{empi => mdm}/util/IdentifierUtil.java    |   3 +-
 .../EmpiUtil.java => mdm/util/MdmUtil.java}   |  42 +-
 .../{empi => mdm}/util/MessageHelper.java     |  18 +-
 .../uhn/fhir/{empi => mdm}/util/NameUtil.java |   2 +-
 .../util/PrimitiveTypeComparingPredicate.java |   8 +-
 .../rules/json/VectorMatchResultMapTest.java  |  42 --
 .../rules/matcher/StringMatcherR4Test.java    | 154 --------
 .../empi/rules/svc/BaseEmpiRulesR4Test.java   |  74 ----
 .../svc/CustomResourceMatcherR4Test.java      | 132 -------
 .../ca/uhn/fhir/{empi => mdm}/BaseR4Test.java |  24 +-
 .../api/MdmMatchOutcomeTest.java}             |  14 +-
 .../rules/config/MdmRuleValidatorTest.java}   |  12 +-
 .../rules/json/MdmRulesJsonR4Test.java}       |  26 +-
 .../rules/json/VectorMatchResultMapTest.java  |  42 ++
 .../rules/matcher/BaseMatcherR4Test.java      |   2 +-
 .../rules/matcher/DateMatcherR4Test.java      |   6 +-
 .../matcher/IdentifierMatcherR4Test.java      |  22 +-
 .../rules/matcher/StringMatcherR4Test.java    | 154 ++++++++
 .../rules/matcher/StringSimilarityR4Test.java |   8 +-
 .../mdm/rules/svc/BaseMdmRulesR4Test.java     |  74 ++++
 .../svc/CustomResourceMatcherR4Test.java      | 132 +++++++
 .../svc/MdmResourceFieldMatcherR4Test.java}   |  23 +-
 .../svc/MdmResourceMatcherSvcR4Test.java}     |  26 +-
 .../rules/svc/ResourceMatcherR4Test.java      |  46 +--
 .../{empi => mdm}/svc/EIDHelperR4Test.java    |  29 +-
 .../svc/GoldenResourceHelperDSTU3Test.java}   |  13 +-
 .../svc/GoldenResourceHelperR4Test.java}      |  15 +-
 .../{empi => mdm}/svc/NameUtilTestDSTU3.java  |   4 +-
 .../{empi => mdm}/svc/NameUtilTestR4.java     |   4 +-
 .../util/AssuranceLevelUtilTest.java          |  20 +-
 .../PrimitiveTypeComparingPredicateTest.java  |   2 +-
 .../fhir/{empi => mdm}/util/TestUtils.java    |   4 +-
 pom.xml                                       |   8 +-
 194 files changed, 3987 insertions(+), 4070 deletions(-)
 rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/{IEmpiLinkDao.java => IMdmLinkDao.java} (73%)
 rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{empi/EmpiLinkDeleteSvc.java => mdm/MdmLinkDeleteSvc.java} (64%)
 rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/{EmpiLink.java => MdmLink.java} (70%)
 delete mode 100644 hapi-fhir-jpaserver-empi/smile.basedir_IS_UNDEFINED/Link Service.puml
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiConsumerConfig.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubmitterConfig.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvc.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiClearSvcImpl.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiControllerSvcImpl.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcImpl.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvc.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/broker/EmpiMessageHandler.java => mdm/broker/MdmMessageHandler.java} (60%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/broker/EmpiQueueConsumerLoader.java => mdm/broker/MdmQueueConsumerLoader.java} (54%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/config/EmpiLoader.java => mdm/config/MdmLoader.java} (59%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/config/EmpiSearchParameterLoader.java => mdm/config/MdmSearchParameterLoader.java} (66%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/config/EmpiSubscriptionLoader.java => mdm/config/MdmSubscriptionLoader.java} (63%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/dao/EmpiLinkFactory.java => mdm/dao/MdmLinkFactory.java} (61%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/interceptor/IEmpiStorageInterceptor.java => mdm/interceptor/IMdmStorageInterceptor.java} (89%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/interceptor/EmpiStorageInterceptor.java => mdm/interceptor/MdmStorageInterceptor.java} (53%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/interceptor/EmpiSubmitterInterceptorLoader.java => mdm/interceptor/MdmSubmitterInterceptorLoader.java} (76%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/GoldenResourceMergerSvcImpl.java (70%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiChannelSubmitterSvcImpl.java => mdm/svc/MdmChannelSubmitterSvcImpl.java} (67%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiEidUpdateService.java => mdm/svc/MdmEidUpdateService.java} (59%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiPersonDeletingSvc.java => mdm/svc/MdmGoldenResourceDeletingSvc.java} (85%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiLinkQuerySvcImpl.java => mdm/svc/MdmLinkQuerySvcImpl.java} (50%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiLinkUpdaterSvcImpl.java => mdm/svc/MdmLinkUpdaterSvcImpl.java} (60%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiMatchFinderSvcImpl.java => mdm/svc/MdmMatchFinderSvcImpl.java} (64%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiResourceDaoSvc.java => mdm/svc/MdmResourceDaoSvc.java} (88%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiResourceFilteringSvc.java => mdm/svc/MdmResourceFilteringSvc.java} (52%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiSearchParamSvc.java => mdm/svc/MdmSearchParamSvc.java} (97%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/EmpiSubmitSvcImpl.java => mdm/svc/MdmSubmitSvcImpl.java} (65%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/BaseCandidateFinder.java (91%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/CandidateList.java (97%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/CandidateStrategyEnum.java (71%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/FindCandidateByEidSvc.java (76%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/FindCandidateByLinkSvc.java (84%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/FindCandidateByScoreSvc.java (64%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/candidate/MatchedSourceResourceCandidate.java (68%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/candidate/EmpiCandidateSearchCriteriaBuilderSvc.java => mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java} (84%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/candidate/EmpiCandidateSearchSvc.java => mdm/svc/candidate/MdmCandidateSearchSvc.java} (75%)
 rename hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/{empi/svc/candidate/EmpiSourceResourceFindingSvc.java => mdm/svc/candidate/MdmGoldenResourceFindingSvc.java} (89%)
 delete mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvcTest.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/entity/EmpiEnumTest.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiLinkHelper.java
 delete mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseProviderR4Test.java
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/BaseEmpiR4Test.java => mdm/BaseMdmR4Test.java} (74%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/config/BaseTestEmpiConfig.java => mdm/config/BaseTestMdmConfig.java} (65%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/config/TestEmpiConfigR4.java => mdm/config/TestMdmConfigR4.java} (75%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java
 create mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/helper/BaseEmpiHelper.java => mdm/helper/BaseMdmHelper.java} (73%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/helper/EmpiHelperConfig.java => mdm/helper/MdmHelperConfig.java} (63%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/helper/EmpiHelperR4.java => mdm/helper/MdmHelperR4.java} (87%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/interceptor/EmpiExpungeTest.java => mdm/interceptor/MdmExpungeTest.java} (71%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/interceptor/EmpiStorageInterceptorIT.java => mdm/interceptor/MdmStorageInterceptorIT.java} (55%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/BaseSourceResourceMatcher.java (50%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/IsLinkedTo.java (73%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/IsMatchedToAPerson.java (51%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/IsPossibleDuplicateOf.java (54%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/IsPossibleLinkedTo.java (76%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/IsPossibleMatchWith.java (62%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/matcher/IsSameSourceResourceAs.java (81%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/provider/BaseLinkR4Test.java (71%)
 create mode 100644 hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/provider/EmpiProviderBatchR4Test.java => mdm/provider/MdmProviderBatchR4Test.java} (67%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/provider/EmpiProviderClearLinkR4Test.java => mdm/provider/MdmProviderClearLinkR4Test.java} (83%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/provider/EmpiProviderMatchR4Test.java => mdm/provider/MdmProviderMatchR4Test.java} (84%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/provider/EmpiProviderMergePersonsR4Test.java => mdm/provider/MdmProviderMergePersonsR4Test.java} (75%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/provider/EmpiProviderQueryLinkR4Test.java => mdm/provider/MdmProviderQueryLinkR4Test.java} (70%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/provider/EmpiProviderUpdateLinkR4Test.java => mdm/provider/MdmProviderUpdateLinkR4Test.java} (57%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/searchparam/SearchParameterTest.java (90%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi => mdm}/svc/EmpiLinkUpdaterSvcImplTest.java (50%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiBatchSvcImplTest.java => mdm/svc/MdmBatchSvcImplTest.java} (55%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiCandidateSearchCriteriaBuilderSvcTest.java => mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java} (59%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiCandidateSearchSvcTest.java => mdm/svc/MdmCandidateSearchSvcTest.java} (75%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiLinkSvcTest.java => mdm/svc/MdmLinkSvcTest.java} (53%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiMatchLinkSvcMultipleEidModeTest.java => mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java} (83%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiMatchLinkSvcTest.java => mdm/svc/MdmMatchLinkSvcTest.java} (86%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiPersonMergerSvcTest.java => mdm/svc/MdmPersonMergerSvcTest.java} (62%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiResourceDaoSvcTest.java => mdm/svc/MdmResourceDaoSvcTest.java} (82%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiResourceFilteringSvcMockTest.java => mdm/svc/MdmResourceFilteringSvcMockTest.java} (58%)
 rename hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/{empi/svc/EmpiResourceFilteringSvcTest.java => mdm/svc/MdmResourceFilteringSvcTest.java} (70%)
 delete mode 100644 hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchOutcome.java
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/api/IGoldenResourceMergerSvc.java (94%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiChannelSubmitterSvc.java => mdm/api/IMdmChannelSubmitterSvc.java} (77%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiControllerSvc.java => mdm/api/IMdmControllerSvc.java} (65%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiExpungeSvc.java => mdm/api/IMdmExpungeSvc.java} (72%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiLinkQuerySvc.java => mdm/api/IMdmLinkQuerySvc.java} (69%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiLinkSvc.java => mdm/api/IMdmLinkSvc.java} (75%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiLinkUpdaterSvc.java => mdm/api/IMdmLinkUpdaterSvc.java} (81%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiMatchFinderSvc.java => mdm/api/IMdmMatchFinderSvc.java} (89%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiRuleValidator.java => mdm/api/IMdmRuleValidator.java} (81%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiSettings.java => mdm/api/IMdmSettings.java} (68%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/IEmpiSubmitSvc.java => mdm/api/IMdmSubmitSvc.java} (58%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/api/MatchedTarget.java (84%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/EmpiConstants.java => mdm/api/MdmConstants.java} (81%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/EmpiLinkJson.java => mdm/api/MdmLinkJson.java} (74%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/EmpiLinkSourceEnum.java => mdm/api/MdmLinkSourceEnum.java} (93%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/EmpiMatchEvaluation.java => mdm/api/MdmMatchEvaluation.java} (70%)
 create mode 100644 hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/api/EmpiMatchResultEnum.java => mdm/api/MdmMatchResultEnum.java} (95%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/log/Logs.java (76%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/model/CanonicalEID.java (99%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/model/CanonicalIdentityAssuranceLevel.java (97%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/model/MdmTransactionContext.java (97%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/provider/BaseEmpiProvider.java => mdm/provider/BaseMdmProvider.java} (82%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/provider/EmpiControllerHelper.java => mdm/provider/MdmControllerHelper.java} (81%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/provider/EmpiControllerUtil.java => mdm/provider/MdmControllerUtil.java} (83%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/provider/EmpiProviderDstu3.java => mdm/provider/MdmProviderDstu3.java} (81%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/provider/EmpiProviderLoader.java => mdm/provider/MdmProviderLoader.java} (59%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/provider/EmpiProviderR4.java => mdm/provider/MdmProviderR4.java} (84%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/config/EmpiRuleValidator.java => mdm/rules/config/MdmRuleValidator.java} (70%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/config/EmpiSettings.java => mdm/rules/config/MdmSettings.java} (63%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/json/EmpiFieldMatchJson.java => mdm/rules/json/MdmFieldMatchJson.java} (71%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/json/EmpiFilterSearchParamJson.java => mdm/rules/json/MdmFilterSearchParamJson.java} (82%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/json/EmpiMatcherJson.java => mdm/rules/json/MdmMatcherJson.java} (80%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/json/EmpiResourceSearchParamJson.java => mdm/rules/json/MdmResourceSearchParamJson.java} (84%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/json/EmpiRulesJson.java => mdm/rules/json/MdmRulesJson.java} (73%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/json/EmpiSimilarityJson.java => mdm/rules/json/MdmSimilarityJson.java} (73%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/json/VectorMatchResultMap.java (71%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/BaseHapiStringMetric.java (96%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/HapiDateMatcher.java (93%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/HapiDateMatcherDstu3.java (98%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/HapiDateMatcherR4.java (98%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/HapiStringMatcher.java (89%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/matcher/IEmpiFieldMatcher.java => mdm/rules/matcher/IMdmFieldMatcher.java} (93%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/matcher/IEmpiStringMatcher.java => mdm/rules/matcher/IMdmStringMatcher.java} (90%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/IdentifierMatcher.java (88%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/matcher/EmpiMatcherEnum.java => mdm/rules/matcher/MdmMatcherEnum.java} (89%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/matcher/EmpiPersonNameMatchModeEnum.java => mdm/rules/matcher/MdmPersonNameMatchModeEnum.java} (89%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/NameMatcher.java (88%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/PhoneticEncoderMatcher.java (92%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/SubstringStringMatcher.java (89%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/rules/similarity/HapiStringSimilarity.java (92%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/similarity/IEmpiFieldSimilarity.java => mdm/rules/similarity/IMdmFieldSimilarity.java} (92%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/similarity/EmpiSimilarityEnum.java => mdm/rules/similarity/MdmSimilarityEnum.java} (71%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/svc/EmpiResourceFieldMatcher.java => mdm/rules/svc/MdmResourceFieldMatcher.java} (66%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/rules/svc/EmpiResourceMatcherSvc.java => mdm/rules/svc/MdmResourceMatcherSvc.java} (60%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/AssuranceLevelUtil.java (85%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/CanonicalIdentifier.java (98%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/EIDHelper.java (85%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/util/PersonHelper.java => mdm/util/GoldenResourceHelper.java} (95%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/IdentifierUtil.java (96%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi/util/EmpiUtil.java => mdm/util/MdmUtil.java} (67%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/MessageHelper.java (81%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/NameUtil.java (98%)
 rename hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/{empi => mdm}/util/PrimitiveTypeComparingPredicate.java (80%)
 delete mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMapTest.java
 delete mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringMatcherR4Test.java
 delete mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
 delete mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/CustomResourceMatcherR4Test.java
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/BaseR4Test.java (56%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/api/EmpiMatchOutcomeTest.java => mdm/api/MdmMatchOutcomeTest.java} (56%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/rules/config/EmpiRuleValidatorTest.java => mdm/rules/config/MdmRuleValidatorTest.java} (91%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/rules/json/EmpiRulesJsonR4Test.java => mdm/rules/json/MdmRulesJsonR4Test.java} (70%)
 create mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/BaseMatcherR4Test.java (80%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/DateMatcherR4Test.java (92%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/IdentifierMatcherR4Test.java (73%)
 create mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/rules/matcher/StringSimilarityR4Test.java (85%)
 create mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java
 create mode 100644 hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/rules/svc/EmpiResourceFieldMatcherR4Test.java => mdm/rules/svc/MdmResourceFieldMatcherR4Test.java} (69%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/rules/svc/EmpiResourceMatcherSvcR4Test.java => mdm/rules/svc/MdmResourceMatcherSvcR4Test.java} (57%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/rules/svc/ResourceMatcherR4Test.java (61%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/svc/EIDHelperR4Test.java (78%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/svc/PersonHelperDSTU3Test.java => mdm/svc/GoldenResourceHelperDSTU3Test.java} (86%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi/svc/PersonHelperR4Test.java => mdm/svc/GoldenResourceHelperR4Test.java} (85%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/svc/NameUtilTestDSTU3.java (95%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/svc/NameUtilTestR4.java (95%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/util/AssuranceLevelUtilTest.java (74%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/util/PrimitiveTypeComparingPredicateTest.java (98%)
 rename hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/{empi => mdm}/util/TestUtils.java (67%)

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java
index bd86c55a044..573413e2248 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/api/Pointcut.java
@@ -1703,9 +1703,9 @@ public enum Pointcut {
 	),
 
 	/**
-	 * <b>EMPI Hook:</b>
-	 * Invoked whenever a persisted Patient/Practitioner resource (a resource that has just been stored in the
-	 * database via a create/update/patch/etc.) has been matched against related resources and EMPI links have been updated.
+	 * <b>MDM(EMPI) Hook:</b>
+	 * Invoked whenever a persisted resource (a resource that has just been stored in the
+	 * database via a create/update/patch/etc.) has been matched against related resources and MDM links have been updated.
 	 * <p>
 	 * Hooks may accept the following parameters:
 	 * <ul>
@@ -1717,7 +1717,7 @@ public enum Pointcut {
 	 * Hooks should return <code>void</code>.
 	 * </p>
 	 */
-	EMPI_AFTER_PERSISTED_RESOURCE_CHECKED(void.class, "ca.uhn.fhir.rest.server.messaging.ResourceOperationMessage", "ca.uhn.fhir.rest.server.TransactionLogMessages"),
+	MDM_AFTER_PERSISTED_RESOURCE_CHECKED(void.class, "ca.uhn.fhir.rest.server.messaging.ResourceOperationMessage", "ca.uhn.fhir.rest.server.TransactionLogMessages"),
 
 	/**
 	 * <b>Performance Tracing Hook:</b>
diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml
index fb1b44a18b3..905afb9eb28 100644
--- a/hapi-fhir-bom/pom.xml
+++ b/hapi-fhir-bom/pom.xml
@@ -38,7 +38,7 @@
             </dependency>
 			  <dependency>
 				  <groupId>${project.groupId}</groupId>
-				  <artifactId>hapi-fhir-server-empi</artifactId>
+				  <artifactId>hapi-fhir-server-mdm</artifactId>
 				  <version>${project.version}</version>
 			  </dependency>
             <dependency>
@@ -103,7 +103,7 @@
             </dependency>
 			  <dependency>
 				  <groupId>${project.groupId}</groupId>
-				  <artifactId>hapi-fhir-jpaserver-empi</artifactId>
+				  <artifactId>hapi-fhir-jpaserver-mdm</artifactId>
 				  <version>${project.version}</version>
 			  </dependency>
             <dependency>
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md
index e334acd738b..b5a35079fcc 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi.md
@@ -30,6 +30,6 @@ HAPI EMPI keeps track of which links were automatically established vs manually
 
 Follow these steps to enable EMPI on the server:
 
-The [EmpiSettings](/hapi-fhir/apidocs/hapi-fhir-server-empi/ca/uhn/fhir/empi/rules/config/EmpiSettings.html) bean contains configuration settings related to EMPI within the server. To enable EMPI, the [setEnabled(boolean)](/hapi-fhir/apidocs/hapi-fhir-server-empi/ca/uhn/fhir/empi/rules/config/EmpiSettings.html#setEnabled(boolean)) property should be enabled.
+The [EmpiSettings](/hapi-fhir/apidocs/hapi-fhir-server-mdm/ca/uhn/fhir/empi/rules/config/EmpiSettings.html) bean contains configuration settings related to EMPI within the server. To enable EMPI, the [setEnabled(boolean)](/hapi-fhir/apidocs/hapi-fhir-server-mdm/ca/uhn/fhir/empi/rules/config/EmpiSettings.html#setEnabled(boolean)) property should be enabled.
 
 See [EMPI EID Settings](/hapi-fhir/docs/server_jpa_empi/empi_eid.html#empi-eid-settings) for a description of the EID-related settings.
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_eid.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_eid.md
index 8287bac64f5..04e9aafda65 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_eid.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_eid.md
@@ -4,11 +4,11 @@ An Enterprise Identifier(EID) is a unique identifier that can be attached to Pat
 
 ## EMPI EID Settings
 
-The [EmpiSettings](/hapi-fhir/apidocs/hapi-fhir-server-empi/ca/uhn/fhir/empi/rules/config/EmpiSettings.html) bean contains two EID related settings.  Both are enabled by default.
+The [EmpiSettings](/hapi-fhir/apidocs/hapi-fhir-server-mdm/ca/uhn/fhir/empi/rules/config/EmpiSettings.html) bean contains two EID related settings.  Both are enabled by default.
 
-* **Prevent EID Updates** ([JavaDoc](/hapi-fhir/apidocs/hapi-fhir-server-empi/ca/uhn/fhir/empi/rules/config/EmpiSettings.html#setPreventEidUpdates(boolean))): If this is enabled, then once an EID is set on a resource, it cannot be changed. If disabled, patients may have their EID updated.
+* **Prevent EID Updates** ([JavaDoc](/hapi-fhir/apidocs/hapi-fhir-server-mdm/ca/uhn/fhir/empi/rules/config/EmpiSettings.html#setPreventEidUpdates(boolean))): If this is enabled, then once an EID is set on a resource, it cannot be changed. If disabled, patients may have their EID updated.
 
-* **Prevent multiple EIDs**: ([JavaDoc](/hapi-fhir/apidocs/hapi-fhir-server-empi/ca/uhn/fhir/empi/rules/config/EmpiSettings.html#setPreventMultipleEids(boolean))): If this is enabled, then a resource cannot have more than one EID, and incoming resources that break this rule will be rejected.
+* **Prevent multiple EIDs**: ([JavaDoc](/hapi-fhir/apidocs/hapi-fhir-server-mdm/ca/uhn/fhir/empi/rules/config/EmpiSettings.html#setPreventMultipleEids(boolean))): If this is enabled, then a resource cannot have more than one EID, and incoming resources that break this rule will be rejected.
 
 ## EMPI EID Scenarios
 
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_operations.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_operations.md
index b4fdcdc3393..58758b39fbb 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_operations.md
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_empi/empi_operations.md
@@ -1,6 +1,6 @@
 # EMPI Operations
 
-EMPI links are managed by EMPI Operations. These operations are supplied by a [plain provider](/docs/server_plain/resource_providers.html#plain-providers) called [EmpiProvider](/hapi-fhir/apidocs/hapi-fhir-server-empi/ca/uhn/fhir/empi/provider/EmpiProviderR4.html).
+EMPI links are managed by EMPI Operations. These operations are supplied by a [plain provider](/docs/server_plain/resource_providers.html#plain-providers) called [EmpiProvider](/hapi-fhir/apidocs/hapi-fhir-server-mdm/ca/uhn/fhir/empi/provider/EmpiProviderR4.html).
 
 In cases where the operation changes data, if a resource id parameter contains a version (e.g. `Person/123/_history/1`), then the operation will fail with a 409 CONFLICT if that is not the latest version of that resource.  This feature can be used to prevent update conflicts in an environment where multiple users are working on the same set of empi links.
 
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
index ec880668d86..f87e910fb71 100644
--- a/hapi-fhir-jacoco/pom.xml
+++ b/hapi-fhir-jacoco/pom.xml
@@ -33,7 +33,7 @@
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server-empi</artifactId>
+			<artifactId>hapi-fhir-server-mdm</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -108,7 +108,7 @@
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-empi</artifactId>
+			<artifactId>hapi-fhir-jpaserver-mdm</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index 25b7f0fc3ca..f2c62811142 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -77,7 +77,7 @@
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server-empi</artifactId>
+			<artifactId>hapi-fhir-server-mdm</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
index ed155fc3647..2c6f386d2be 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
@@ -88,9 +88,8 @@ import ca.uhn.fhir.rest.server.interceptor.consent.IConsentContextServices;
 import ca.uhn.fhir.rest.server.interceptor.partition.RequestTenantPartitionInterceptor;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.utilities.npm.BasePackageCacheManager;
-import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
 import org.hl7.fhir.utilities.graphql.IGraphQLStorageServices;
+import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
 import org.springframework.batch.core.configuration.annotation.BatchConfigurer;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,7 +146,7 @@ import java.util.Date;
 	@ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*Test.*"),
 	@ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.subscription.*"),
 	@ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.searchparam.*"),
-	@ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.empi.*"),
+	@ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.mdm.*"),
 	@ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.starter.*"),
 	@ComponentScan.Filter(type = FilterType.REGEX, pattern = "ca.uhn.fhir.jpa.batch.*")
 })
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IEmpiLinkDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkDao.java
similarity index 73%
rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IEmpiLinkDao.java
rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkDao.java
index 629f8b8c578..be63bbd2d9a 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IEmpiLinkDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IMdmLinkDao.java
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.dao.data;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -29,12 +29,12 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface IEmpiLinkDao extends JpaRepository<EmpiLink, Long> {
+public interface IMdmLinkDao extends JpaRepository<MdmLink, Long> {
 	@Modifying
-	@Query("DELETE FROM EmpiLink f WHERE myPersonPid = :pid OR myTargetPid = :pid")
+	@Query("DELETE FROM MdmLink f WHERE myPersonPid = :pid OR myTargetPid = :pid")
 	int deleteWithAnyReferenceToPid(@Param("pid") Long thePid);
 
 	@Modifying
-	@Query("DELETE FROM EmpiLink f WHERE (myPersonPid = :pid OR myTargetPid = :pid) AND myMatchResult <> :matchResult")
-	int deleteWithAnyReferenceToPidAndMatchResultNot(@Param("pid") Long thePid, @Param("matchResult")EmpiMatchResultEnum theMatchResult);
+	@Query("DELETE FROM MdmLink f WHERE (myPersonPid = :pid OR myTargetPid = :pid) AND myMatchResult <> :matchResult")
+	int deleteWithAnyReferenceToPidAndMatchResultNot(@Param("pid") Long thePid, @Param("matchResult") MdmMatchResultEnum theMatchResult);
 }
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/empi/EmpiLinkDeleteSvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDeleteSvc.java
similarity index 64%
rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/empi/EmpiLinkDeleteSvc.java
rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDeleteSvc.java
index 4a723b15e6d..cd143f532f9 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/empi/EmpiLinkDeleteSvc.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/mdm/MdmLinkDeleteSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.dao.empi;
+package ca.uhn.fhir.jpa.dao.mdm;
 
 /*-
  * #%L
@@ -20,8 +20,9 @@ package ca.uhn.fhir.jpa.dao.empi;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.jpa.dao.data.IEmpiLinkDao;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.slf4j.Logger;
@@ -30,33 +31,33 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmpiLinkDeleteSvc {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiLinkDeleteSvc.class);
+public class MdmLinkDeleteSvc {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmLinkDeleteSvc.class);
 
 	@Autowired
-	private IEmpiLinkDao myEmpiLinkDao;
+	private IMdmLinkDao myMdmLinkDao;
 	@Autowired
 	private IdHelperService myIdHelperService;
 
 	/**
-	 * Delete all EmpiLink records with any reference to this resource.  (Used by Expunge.)
+	 * Delete all {@link MdmLink} records with any reference to this resource.  (Used by Expunge.)
 	 * @param theResource
 	 * @return the number of records deleted
 	 */
 	public int deleteWithAnyReferenceTo(IBaseResource theResource) {
 		Long pid = myIdHelperService.getPidOrThrowException(theResource.getIdElement(), null);
-		int removed =  myEmpiLinkDao.deleteWithAnyReferenceToPid(pid);
+		int removed =  myMdmLinkDao.deleteWithAnyReferenceToPid(pid);
 		if (removed > 0) {
-			ourLog.info("Removed {} EMPI links with references to {}", removed, theResource.getIdElement().toVersionless());
+			ourLog.info("Removed {} MDM links with references to {}", removed, theResource.getIdElement().toVersionless());
 		}
 		return removed;
 	}
 
 	public int deleteNonRedirectWithWithAnyReferenceTo(IBaseResource theResource) {
 		Long pid = myIdHelperService.getPidOrThrowException(theResource.getIdElement(), null);
-		int removed =  myEmpiLinkDao.deleteWithAnyReferenceToPidAndMatchResultNot(pid, EmpiMatchResultEnum.REDIRECT);
+		int removed =  myMdmLinkDao.deleteWithAnyReferenceToPidAndMatchResultNot(pid, MdmMatchResultEnum.REDIRECT);
 		if (removed > 0) {
-			ourLog.info("Removed {} non-redirect EMPI links with references to {}", removed, theResource.getIdElement().toVersionless());
+			ourLog.info("Removed {} non-redirect MDM links with references to {}", removed, theResource.getIdElement().toVersionless());
 		}
 		return removed;
 	}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/EmpiLink.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java
similarity index 70%
rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/EmpiLink.java
rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java
index 26b540c7093..afc6f6ff967 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/EmpiLink.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.entity;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.jpa.model.entity.ResourceTable;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -47,7 +47,7 @@ import java.util.Date;
 @Table(name = "MPI_LINK", uniqueConstraints = {
 	@UniqueConstraint(name = "IDX_EMPI_PERSON_TGT", columnNames = {"PERSON_PID", "TARGET_PID"}),
 })
-public class EmpiLink {
+public class MdmLink {
 	public static final int VERSION_LENGTH = 16;
 	private static final int MATCH_RESULT_LENGTH = 16;
 	private static final int LINK_SOURCE_LENGTH = 16;
@@ -61,16 +61,18 @@ public class EmpiLink {
 	private Long myId;
 
 	@ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = {})
-	@JoinColumn(name = "SOURCE_RESOURCE_PID", referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_EMPI_LINK_SOURCE_RESOURCE"), insertable=false, updatable=false, nullable=false)
-	private ResourceTable mySourceResource;
+	@JoinColumn(name = "GOLDEN_RESOURCE_PID", referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_EMPI_LINK_GOLDEN_RESOURCE"), insertable=false, updatable=false, nullable=false)
+	private ResourceTable myGoldenResource;
 
-	@Column(name = "SOURCE_RESOURCE_PID", nullable=false)
-	private Long mySourceResourcePid;
+	@Column(name = "GOLDEN_RESOURCE_PID", nullable=false)
+	private Long myGoldenResourcePid;
 
+	@Deprecated
 	@ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = {})
 	@JoinColumn(name = "PERSON_PID", referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_EMPI_LINK_PERSON"), insertable=false, updatable=false, nullable=false)
 	private ResourceTable myPerson;
 
+	@Deprecated
 	@Column(name = "PERSON_PID", nullable=false)
 	private Long myPersonPid;
 
@@ -83,11 +85,11 @@ public class EmpiLink {
 
 	@Column(name = "MATCH_RESULT", nullable = false)
 	@Enumerated(EnumType.ORDINAL)
-	private EmpiMatchResultEnum myMatchResult;
+	private MdmMatchResultEnum myMatchResult;
 
 	@Column(name = "LINK_SOURCE", nullable = false)
 	@Enumerated(EnumType.ORDINAL)
-	private EmpiLinkSourceEnum myLinkSource;
+	private MdmLinkSourceEnum myLinkSource;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name = "CREATED", nullable = false)
@@ -118,47 +120,47 @@ public class EmpiLink {
 	@Column(name = "RULE_COUNT")
 	private Long myRuleCount;
 
-	public EmpiLink() {}
+	public MdmLink() {}
 
-	public EmpiLink(String theVersion) {
+	public MdmLink(String theVersion) {
 		myVersion = theVersion;
 	}
 
 	@Column(name = "TARGET_TYPE", nullable = true, length = TARGET_TYPE_LENGTH)
-	private String myEmpiTargetType;
+	private String myMdmTargetType;
 
 	public Long getId() {
 		return myId;
 	}
 
-	public EmpiLink setId(Long theId) {
+	public MdmLink setId(Long theId) {
 		myId = theId;
 		return this;
 	}
 
-	public ResourceTable getSourceResource() {
-		return mySourceResource;
+	public ResourceTable getGoldenResource() {
+		return myGoldenResource;
 	}
 
-	public EmpiLink setSourceResource(ResourceTable theSourceResource) {
-		mySourceResource = theSourceResource;
-		mySourceResourcePid = theSourceResource.getId();
+	public MdmLink setGoldenResource(ResourceTable theGoldenResource) {
+		myGoldenResource = theGoldenResource;
+		myGoldenResourcePid = theGoldenResource.getId();
 		return this;
 	}
 
-	public Long getSourceResourcePid() {
-		return mySourceResourcePid;
+	public Long getGoldenResourcePid() {
+		return myGoldenResourcePid;
 	}
 
-	public EmpiLink setPersonPid(Long thePersonPid) {
+	public MdmLink setPersonPid(Long thePersonPid) {
 		myPersonPid = thePersonPid;
 		return this;
 	}
 
-	public EmpiLink setGoldenResourcePid(Long theSourceResourcePid) {
+	public MdmLink setGoldenResourcePid(Long theSourceResourcePid) {
 		setPersonPid(theSourceResourcePid);
 
-		mySourceResourcePid = theSourceResourcePid;
+		myGoldenResourcePid = theSourceResourcePid;
 		return this;
 	}
 
@@ -166,7 +168,7 @@ public class EmpiLink {
 		return myTarget;
 	}
 
-	public EmpiLink setTarget(ResourceTable theTarget) {
+	public MdmLink setTarget(ResourceTable theTarget) {
 		myTarget = theTarget;
 		myTargetPid = theTarget.getId();
 		return this;
@@ -176,62 +178,62 @@ public class EmpiLink {
 		return myTargetPid;
 	}
 
-	public EmpiLink setTargetPid(Long theTargetPid) {
+	public MdmLink setTargetPid(Long theTargetPid) {
 		myTargetPid = theTargetPid;
 		return this;
 	}
 
-	public EmpiMatchResultEnum getMatchResult() {
+	public MdmMatchResultEnum getMatchResult() {
 		return myMatchResult;
 	}
 
-	public EmpiLink setMatchResult(EmpiMatchResultEnum theMatchResult) {
+	public MdmLink setMatchResult(MdmMatchResultEnum theMatchResult) {
 		myMatchResult = theMatchResult;
 		return this;
 	}
 
 	public boolean isNoMatch() {
-		return myMatchResult == EmpiMatchResultEnum.NO_MATCH;
+		return myMatchResult == MdmMatchResultEnum.NO_MATCH;
 	}
 
 	public boolean isMatch() {
-		return myMatchResult == EmpiMatchResultEnum.MATCH;
+		return myMatchResult == MdmMatchResultEnum.MATCH;
 	}
 
 	public boolean isPossibleMatch() {
-		return myMatchResult == EmpiMatchResultEnum.POSSIBLE_MATCH;
+		return myMatchResult == MdmMatchResultEnum.POSSIBLE_MATCH;
 	}
 
 	public boolean isRedirect() {
-		return myMatchResult == EmpiMatchResultEnum.REDIRECT;
+		return myMatchResult == MdmMatchResultEnum.REDIRECT;
 	}
 
 	public boolean isPossibleDuplicate() {
-		return myMatchResult == EmpiMatchResultEnum.POSSIBLE_DUPLICATE;
+		return myMatchResult == MdmMatchResultEnum.POSSIBLE_DUPLICATE;
 	}
 
-	public EmpiLinkSourceEnum getLinkSource() {
+	public MdmLinkSourceEnum getLinkSource() {
 		return myLinkSource;
 	}
 
-	public EmpiLink setLinkSource(EmpiLinkSourceEnum theLinkSource) {
+	public MdmLink setLinkSource(MdmLinkSourceEnum theLinkSource) {
 		myLinkSource = theLinkSource;
 		return this;
 	}
 
 	public boolean isAuto() {
-		return myLinkSource == EmpiLinkSourceEnum.AUTO;
+		return myLinkSource == MdmLinkSourceEnum.AUTO;
 	}
 
 	public boolean isManual() {
-		return myLinkSource == EmpiLinkSourceEnum.MANUAL;
+		return myLinkSource == MdmLinkSourceEnum.MANUAL;
 	}
 
 	public Date getCreated() {
 		return myCreated;
 	}
 
-	public EmpiLink setCreated(Date theCreated) {
+	public MdmLink setCreated(Date theCreated) {
 		myCreated = theCreated;
 		return this;
 	}
@@ -240,7 +242,7 @@ public class EmpiLink {
 		return myUpdated;
 	}
 
-	public EmpiLink setUpdated(Date theUpdated) {
+	public MdmLink setUpdated(Date theUpdated) {
 		myUpdated = theUpdated;
 		return this;
 	}
@@ -249,7 +251,7 @@ public class EmpiLink {
 		return myVersion;
 	}
 
-	public EmpiLink setVersion(String theVersion) {
+	public MdmLink setVersion(String theVersion) {
 		myVersion = theVersion;
 		return this;
 	}
@@ -258,7 +260,7 @@ public class EmpiLink {
 		return myVector;
 	}
 
-	public EmpiLink setVector(Long theVector) {
+	public MdmLink setVector(Long theVector) {
 		myVector = theVector;
 		return this;
 	}
@@ -267,7 +269,7 @@ public class EmpiLink {
 		return myScore;
 	}
 
-	public EmpiLink setScore(Double theScore) {
+	public MdmLink setScore(Double theScore) {
 		myScore = theScore;
 		return this;
 	}
@@ -280,7 +282,7 @@ public class EmpiLink {
 		return myEidMatch != null && myEidMatch;
 	}
 
-	public EmpiLink setEidMatch(Boolean theEidMatch) {
+	public MdmLink setEidMatch(Boolean theEidMatch) {
 		myEidMatch = theEidMatch;
 		return this;
 	}
@@ -289,13 +291,13 @@ public class EmpiLink {
 		return myHadToCreateNewResource != null && myHadToCreateNewResource;
 	}
 
-	public EmpiLink setHadToCreateNewResource(Boolean theHadToCreateNewResource) {
+	public MdmLink setHadToCreateNewResource(Boolean theHadToCreateNewResource) {
 		myHadToCreateNewResource = theHadToCreateNewResource;
 		return this;
 	}
 
-	public EmpiLink setEmpiTargetType(String theEmpiTargetType) {
-		myEmpiTargetType = theEmpiTargetType;
+	public MdmLink setMdmTargetType(String mdmTargetType) {
+		myMdmTargetType = mdmTargetType;
 		return this;
 	}
 
@@ -303,19 +305,20 @@ public class EmpiLink {
 	public String toString() {
 		return new ToStringBuilder(this)
 			.append("myId", myId)
-			.append("myPersonPid", mySourceResourcePid)
+			.append("myGoldenResource", myGoldenResourcePid)
 			.append("myTargetPid", myTargetPid)
-			.append("myEmpiTargetType", myEmpiTargetType)
+			.append("myMdmTargetType", myMdmTargetType)
 			.append("myMatchResult", myMatchResult)
 			.append("myLinkSource", myLinkSource)
 			.append("myEidMatch", myEidMatch)
-			.append("myNewPerson", myHadToCreateNewResource)
+			.append("myHadToCreateNewResource", myHadToCreateNewResource)
 			.append("myScore", myScore)
+			.append("myRuleCount", myRuleCount)
 			.toString();
 	}
 
-	public String getEmpiTargetType() {
-		return myEmpiTargetType;
+	public String getMdmTargetType() {
+		return myMdmTargetType;
 	}
 
 	public Long getRuleCount() {
diff --git a/hapi-fhir-jpaserver-empi/pom.xml b/hapi-fhir-jpaserver-empi/pom.xml
index d5094d752b0..567571e0ce4 100644
--- a/hapi-fhir-jpaserver-empi/pom.xml
+++ b/hapi-fhir-jpaserver-empi/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>hapi-fhir-jpaserver-empi</artifactId>
+	<artifactId>hapi-fhir-jpaserver-mdm</artifactId>
 	<packaging>jar</packaging>
 
 	<name>HAPI FHIR JPA Server - Enterprise Master Patient Index</name>
@@ -18,7 +18,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server-empi</artifactId>
+			<artifactId>hapi-fhir-server-mdm</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/hapi-fhir-jpaserver-empi/smile.basedir_IS_UNDEFINED/Link Service.puml b/hapi-fhir-jpaserver-empi/smile.basedir_IS_UNDEFINED/Link Service.puml
deleted file mode 100644
index afaeec50026..00000000000
--- a/hapi-fhir-jpaserver-empi/smile.basedir_IS_UNDEFINED/Link Service.puml	
+++ /dev/null
@@ -1,26 +0,0 @@
-@startuml
-
-abstract class AbstractList
-abstract AbstractCollection
-interface List
-interface Collection
-
-List <|-- AbstractList
-Collection <|-- AbstractCollection
-
-Collection <|- List
-AbstractCollection <|- AbstractList
-AbstractList <|-- ArrayList
-
-class ArrayList {
-Object[] elementData
-size()
-}
-
-enum TimeUnit {
-DAYS
-HOURS
-MINUTES
-}
-
-@enduml
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiConsumerConfig.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiConsumerConfig.java
deleted file mode 100644
index 177d267ec6e..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiConsumerConfig.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package ca.uhn.fhir.jpa.empi.config;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiControllerSvc;
-import ca.uhn.fhir.empi.api.IEmpiExpungeSvc;
-import ca.uhn.fhir.empi.api.IEmpiLinkQuerySvc;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.api.IEmpiLinkUpdaterSvc;
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.IGoldenResourceMergerSvc;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.provider.EmpiControllerHelper;
-import ca.uhn.fhir.empi.provider.EmpiProviderLoader;
-import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
-import ca.uhn.fhir.empi.rules.svc.EmpiResourceMatcherSvc;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.empi.util.MessageHelper;
-import ca.uhn.fhir.empi.util.PersonHelper;
-import ca.uhn.fhir.jpa.dao.empi.EmpiLinkDeleteSvc;
-import ca.uhn.fhir.jpa.empi.broker.EmpiMessageHandler;
-import ca.uhn.fhir.jpa.empi.broker.EmpiQueueConsumerLoader;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkFactory;
-import ca.uhn.fhir.jpa.empi.interceptor.EmpiStorageInterceptor;
-import ca.uhn.fhir.jpa.empi.interceptor.IEmpiStorageInterceptor;
-import ca.uhn.fhir.jpa.empi.svc.EmpiClearSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiControllerSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiEidUpdateService;
-import ca.uhn.fhir.jpa.empi.svc.EmpiLinkQuerySvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiLinkSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiLinkUpdaterSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiMatchFinderSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiMatchLinkSvc;
-import ca.uhn.fhir.jpa.empi.svc.EmpiPersonDeletingSvc;
-import ca.uhn.fhir.jpa.empi.svc.GoldenResourceMergerSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiResourceDaoSvc;
-import ca.uhn.fhir.jpa.empi.svc.EmpiResourceFilteringSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiCandidateSearchCriteriaBuilderSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiCandidateSearchSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiSourceResourceFindingSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.FindCandidateByEidSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.FindCandidateByLinkSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.FindCandidateByScoreSvc;
-import ca.uhn.fhir.rest.server.util.ISearchParamRetriever;
-import ca.uhn.fhir.validation.IResourceLoader;
-import org.slf4j.Logger;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class EmpiConsumerConfig {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
-
-	@Bean
-	IEmpiStorageInterceptor empiStorageInterceptor() {
-		return new EmpiStorageInterceptor();
-	}
-
-	@Bean
-	EmpiQueueConsumerLoader empiQueueConsumerLoader() {
-		return new EmpiQueueConsumerLoader();
-	}
-
-	@Bean
-	EmpiMessageHandler empiMessageHandler() {
-		return new EmpiMessageHandler();
-	}
-
-	@Bean
-	EmpiMatchLinkSvc empiMatchLinkSvc() {
-		return new EmpiMatchLinkSvc();
-	}
-
-	@Bean
-	EmpiEidUpdateService eidUpdateService() {
-		return new EmpiEidUpdateService();
-	}
-
-	@Bean
-	EmpiResourceDaoSvc empiResourceDaoSvc() {
-		return new EmpiResourceDaoSvc();
-	}
-
-	@Bean
-	IEmpiLinkSvc empiLinkSvc() {
-		return new EmpiLinkSvcImpl();
-	}
-
-	@Bean
-	PersonHelper personHelper(FhirContext theFhirContext) {
-		return new PersonHelper(theFhirContext);
-	}
-
-	@Bean
-	MessageHelper messageHelper(IEmpiSettings theEmpiSettings, FhirContext theFhirContext) {
-		return new MessageHelper(theEmpiSettings, theFhirContext);
-	}
-
-	@Bean
-	EmpiSubscriptionLoader empiSubscriptionLoader() {
-		return new EmpiSubscriptionLoader();
-	}
-
-	@Bean
-	EmpiSearchParameterLoader empiSearchParameterLoader() {
-		return new EmpiSearchParameterLoader();
-	}
-
-	@Bean
-	EmpiSourceResourceFindingSvc empiPersonFindingSvc() {
-		return new EmpiSourceResourceFindingSvc();
-	}
-
-	@Bean
-	FindCandidateByEidSvc findCandidateByEidSvc() {
-		return new FindCandidateByEidSvc();
-	}
-
-	@Bean
-	FindCandidateByLinkSvc findCandidateByLinkSvc() {
-		return new FindCandidateByLinkSvc();
-	}
-
-	@Bean
-	FindCandidateByScoreSvc findCandidateByScoreSvc() {
-		return new FindCandidateByScoreSvc();
-	}
-
-	@Bean
-	EmpiProviderLoader empiProviderLoader() {
-		return new EmpiProviderLoader();
-	}
-
-	@Bean
-	EmpiRuleValidator empiRuleValidator(FhirContext theFhirContext, ISearchParamRetriever theSearchParamRetriever) {
-		return new EmpiRuleValidator(theFhirContext, theSearchParamRetriever);
-	}
-
-	@Bean
-	IEmpiMatchFinderSvc empiMatchFinderSvc() {
-		return new EmpiMatchFinderSvcImpl();
-	}
-
-	@Bean
-	IGoldenResourceMergerSvc empiPersonMergerSvc() {
-		return new GoldenResourceMergerSvcImpl();
-	}
-
-
-	@Bean
-	IEmpiLinkQuerySvc empiLinkQuerySvc() {
-		return new EmpiLinkQuerySvcImpl();
-	}
-
-	@Bean
-	IEmpiExpungeSvc empiResetSvc(EmpiLinkDaoSvc theEmpiLinkDaoSvc, EmpiPersonDeletingSvc theEmpiPersonDeletingSvcImpl, IEmpiSettings theIEmpiSettings) {
-		return new EmpiClearSvcImpl(theEmpiLinkDaoSvc, theEmpiPersonDeletingSvcImpl, theIEmpiSettings);
-	}
-
-	@Bean
-	EmpiCandidateSearchSvc empiCandidateSearchSvc() {
-		return new EmpiCandidateSearchSvc();
-	}
-
-	@Bean
-	EmpiCandidateSearchCriteriaBuilderSvc empiCriteriaBuilderSvc() {
-		return new EmpiCandidateSearchCriteriaBuilderSvc();
-	}
-
-	@Bean
-	EmpiResourceMatcherSvc empiResourceComparatorSvc(FhirContext theFhirContext, IEmpiSettings theEmpiConfig) {
-		return new EmpiResourceMatcherSvc(theFhirContext, theEmpiConfig);
-	}
-
-	@Bean
-	EIDHelper eidHelper(FhirContext theFhirContext, IEmpiSettings theEmpiConfig) {
-		return new EIDHelper(theFhirContext, theEmpiConfig);
-	}
-
-	@Bean
-	EmpiLinkDaoSvc empiLinkDaoSvc() {
-		return new EmpiLinkDaoSvc();
-	}
-
-	@Bean
-	EmpiLinkFactory empiLinkFactory(IEmpiSettings theEmpiSettings) {
-		return new EmpiLinkFactory(theEmpiSettings);
-	}
-
-	@Bean
-	IEmpiLinkUpdaterSvc manualLinkUpdaterSvc() {
-		return new EmpiLinkUpdaterSvcImpl();
-	}
-
-	@Bean
-	EmpiLoader empiLoader() {
-		return new EmpiLoader();
-	}
-
-	@Bean
-	EmpiLinkDeleteSvc empiLinkDeleteSvc() {
-		return new EmpiLinkDeleteSvc();
-	}
-
-	@Bean
-	EmpiResourceFilteringSvc empiResourceFilteringSvc() {
-		return new EmpiResourceFilteringSvc();
-	}
-
-	@Bean
-	EmpiControllerHelper empiProviderHelper(FhirContext theFhirContext, IResourceLoader theResourceLoader, IEmpiSettings theEmpiSettings, MessageHelper messageHelper) {
-		return new EmpiControllerHelper(theFhirContext, theResourceLoader, theEmpiSettings, messageHelper);
-	}
-
-	@Bean
-	IEmpiControllerSvc empiControllerSvc() {
-		return new EmpiControllerSvcImpl();
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubmitterConfig.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubmitterConfig.java
deleted file mode 100644
index 378a13c65e7..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubmitterConfig.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package ca.uhn.fhir.jpa.empi.config;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiChannelSubmitterSvc;
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
-import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
-import ca.uhn.fhir.jpa.dao.empi.EmpiLinkDeleteSvc;
-import ca.uhn.fhir.jpa.empi.interceptor.EmpiSubmitterInterceptorLoader;
-import ca.uhn.fhir.jpa.empi.svc.EmpiChannelSubmitterSvcImpl;
-import ca.uhn.fhir.jpa.empi.svc.EmpiPersonDeletingSvc;
-import ca.uhn.fhir.jpa.empi.svc.EmpiSearchParamSvc;
-import ca.uhn.fhir.jpa.empi.svc.EmpiSubmitSvcImpl;
-import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration
-public class EmpiSubmitterConfig {
-
-	@Bean
-	EmpiSubmitterInterceptorLoader empiSubmitterInterceptorLoader() {
-		return new EmpiSubmitterInterceptorLoader();
-	}
-
-	@Bean
-	EmpiSearchParamSvc empiSearchParamSvc() {
-		return new EmpiSearchParamSvc();
-	}
-
-	@Bean
-	EmpiRuleValidator empiRuleValidator(FhirContext theFhirContext) {
-		return new EmpiRuleValidator(theFhirContext, empiSearchParamSvc());
-	}
-
-	@Bean
-	EmpiLinkDeleteSvc empiLinkDeleteSvc() {
-		return new EmpiLinkDeleteSvc();
-	}
-
-	@Bean
-	EmpiPersonDeletingSvc empiPersonDeletingSvc() {
-		return new EmpiPersonDeletingSvc();
-	}
-
-	@Bean
-	@Lazy
-	IEmpiChannelSubmitterSvc empiChannelSubmitterSvc(FhirContext theFhirContext, IChannelFactory theChannelFactory) {
-		return new EmpiChannelSubmitterSvcImpl(theFhirContext, theChannelFactory);
-	}
-
-	@Bean
-    IEmpiSubmitSvc empiBatchService() {
-		return new EmpiSubmitSvcImpl();
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvc.java
deleted file mode 100644
index e484396449a..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvc.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package ca.uhn.fhir.jpa.empi.dao;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.jpa.dao.data.IEmpiLinkDao;
-import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class EmpiLinkDaoSvc {
-
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
-
-	@Autowired
-	private IEmpiLinkDao myEmpiLinkDao;
-	@Autowired
-	private EmpiLinkFactory myEmpiLinkFactory;
-	@Autowired
-	private IdHelperService myIdHelperService;
-	@Autowired
-	private FhirContext myFhirContext;
-
-	@Transactional
-	public EmpiLink createOrUpdateLinkEntity(IBaseResource theSourceResource, IBaseResource theTargetResource, EmpiMatchOutcome theMatchOutcome, EmpiLinkSourceEnum theLinkSource, @Nullable MdmTransactionContext theMdmTransactionContext) {
-		Long sourceResourcePid = myIdHelperService.getPidOrNull(theSourceResource);
-		Long targetResourcePid = myIdHelperService.getPidOrNull(theTargetResource);
-
-		EmpiLink empiLink = getOrCreateEmpiLinkBySourceResourcePidAndTargetResourcePid(sourceResourcePid, targetResourcePid);
-		empiLink.setLinkSource(theLinkSource);
-		empiLink.setMatchResult(theMatchOutcome.getMatchResultEnum());
-		// Preserve these flags for link updates
-		empiLink.setEidMatch(theMatchOutcome.isEidMatch() | empiLink.isEidMatch());
-		empiLink.setHadToCreateNewResource(theMatchOutcome.isNewPerson() | empiLink.getHadToCreateNewResource());
-		empiLink.setEmpiTargetType(myFhirContext.getResourceType(theTargetResource));
-		if (empiLink.getScore() != null) {
-			empiLink.setScore(Math.max(theMatchOutcome.score, empiLink.getScore()));
-		} else {
-			empiLink.setScore(theMatchOutcome.score);
-		}
-
-		String message = String.format("Creating EmpiLink from %s to %s -> %s", theSourceResource.getIdElement().toUnqualifiedVersionless(), theTargetResource.getIdElement().toUnqualifiedVersionless(), theMatchOutcome);
-		theMdmTransactionContext.addTransactionLogMessage(message);
-		ourLog.debug(message);
-		save(empiLink);
-		return empiLink;
-	}
-
-	@Nonnull
-	public EmpiLink getOrCreateEmpiLinkBySourceResourcePidAndTargetResourcePid(Long theSourceResourcePid, Long theTargetResourcePid) {
-		Optional<EmpiLink> oExisting = getLinkBySourceResourcePidAndTargetResourcePid(theSourceResourcePid, theTargetResourcePid);
-		if (oExisting.isPresent()) {
-			return oExisting.get();
-		} else {
-			EmpiLink newLink = myEmpiLinkFactory.newEmpiLink();
-			newLink.setGoldenResourcePid(theSourceResourcePid);
-			newLink.setPersonPid(theSourceResourcePid);
-			newLink.setTargetPid(theTargetResourcePid);
-			return newLink;
-		}
-	}
-
-	public Optional<EmpiLink> getLinkBySourceResourcePidAndTargetResourcePid(Long theSourceResourcePid, Long theTargetResourcePid) {
-		if (theTargetResourcePid == null || theSourceResourcePid == null) {
-			return Optional.empty();
-		}
-		EmpiLink link = myEmpiLinkFactory.newEmpiLink();
-		link.setTargetPid(theTargetResourcePid);
-		link.setGoldenResourcePid(theSourceResourcePid);
-		Example<EmpiLink> example = Example.of(link);
-		return myEmpiLinkDao.findOne(example);
-	}
-
-	/**
-	 * Given a Target Pid, and a match result, return all links that match these criteria.
-	 *
-	 * @param theTargetPid   the target of the relationship.
-	 * @param theMatchResult the Match Result of the relationship
-	 * @return a list of {@link EmpiLink} entities matching these criteria.
-	 */
-	public List<EmpiLink> getEmpiLinksByTargetPidAndMatchResult(Long theTargetPid, EmpiMatchResultEnum theMatchResult) {
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink();
-		exampleLink.setTargetPid(theTargetPid);
-		exampleLink.setMatchResult(theMatchResult);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findAll(example);
-	}
-
-	/**
-	 * Given a target Pid, return its Matched EmpiLink. There can only ever be at most one of these, but its possible
-	 * the target has no matches, and may return an empty optional.
-	 *
-	 * @param theTargetPid The Pid of the target you wish to find the matching link for.
-	 * @return the {@link EmpiLink} that contains the Match information for the target.
-	 */
-	public Optional<EmpiLink> getMatchedLinkForTargetPid(Long theTargetPid) {
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink();
-		exampleLink.setTargetPid(theTargetPid);
-		exampleLink.setMatchResult(EmpiMatchResultEnum.MATCH);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findOne(example);
-	}
-
-	/**
-	 * Given an IBaseResource, return its Matched EmpiLink. There can only ever be at most one of these, but its possible
-	 * the target has no matches, and may return an empty optional.
-	 *
-	 * @param theTarget The IBaseResource representing the target you wish to find the matching link for.
-	 * @return the {@link EmpiLink} that contains the Match information for the target.
-	 */
-	public Optional<EmpiLink> getMatchedLinkForTarget(IBaseResource theTarget) {
-		Long pid = myIdHelperService.getPidOrNull(theTarget);
-		if (pid == null) {
-			return Optional.empty();
-		}
-
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink();
-		exampleLink.setTargetPid(pid);
-		exampleLink.setMatchResult(EmpiMatchResultEnum.MATCH);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findOne(example);
-	}
-
-	/**
-	 * Given a person a target and a match result, return the matching EmpiLink, if it exists.
-	 *
-	 * @param thePersonPid   The Pid of the Person in the relationship
-	 * @param theTargetPid   The Pid of the target in the relationship
-	 * @param theMatchResult The MatchResult you are looking for.
-	 * @return an Optional {@link EmpiLink} containing the matched link if it exists.
-	 */
-	public Optional<EmpiLink> getEmpiLinksByPersonPidTargetPidAndMatchResult(Long thePersonPid, Long theTargetPid, EmpiMatchResultEnum theMatchResult) {
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink();
-		exampleLink.setGoldenResourcePid(thePersonPid);
-		exampleLink.setTargetPid(theTargetPid);
-		exampleLink.setMatchResult(theMatchResult);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findOne(example);
-	}
-
-	/**
-	 * Get all {@link EmpiLink} which have {@link EmpiMatchResultEnum#POSSIBLE_DUPLICATE} as their match result.
-	 *
-	 * @return A list of EmpiLinks that hold potential duplicate persons.
-	 */
-	public List<EmpiLink> getPossibleDuplicates() {
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink();
-		exampleLink.setMatchResult(EmpiMatchResultEnum.POSSIBLE_DUPLICATE);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findAll(example);
-	}
-
-	public Optional<EmpiLink> findEmpiLinkByTarget(IBaseResource theTargetResource) {
-		@Nullable Long pid = myIdHelperService.getPidOrNull(theTargetResource);
-		if (pid == null) {
-			return Optional.empty();
-		}
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink().setTargetPid(pid);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findOne(example);
-	}
-
-	/**
-	 * Delete a given EmpiLink. Note that this does not clear out the Person, or the Person's related links.
-	 * It is a simple entity delete.
-	 *
-	 * @param theEmpiLink the EmpiLink to delete.
-	 */
-	@Transactional(propagation = Propagation.REQUIRES_NEW)
-	public void deleteLink(EmpiLink theEmpiLink) {
-		myEmpiLinkDao.delete(theEmpiLink);
-	}
-
-	/**
-	 * Given a Golden Resource , return all links in which they are the source Person of the {@link EmpiLink}
-	 *
-	 * @param theGoldenResource The {@link IBaseResource} Person who's links you would like to retrieve.
-	 * @return A list of all {@link EmpiLink} entities in which theGoldenResource is the source Person.
-	 */
-	public List<EmpiLink> findEmpiLinksByGoldenResource(IBaseResource theGoldenResource) {
-		Long pid = myIdHelperService.getPidOrNull(theGoldenResource);
-		if (pid == null) {
-			return Collections.emptyList();
-		}
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink().setGoldenResourcePid(pid);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findAll(example);
-	}
-
-	/**
-	 * Delete all {@link EmpiLink} entities, and return all resource PIDs from the source of the relationship.
-	 *
-	 * @return A list of Long representing the related Person Pids.
-	 */
-	@Transactional
-	public List<Long> deleteAllEmpiLinksAndReturnGoldenResourcePids() {
-		List<EmpiLink> all = myEmpiLinkDao.findAll();
-		return deleteEmpiLinksAndReturnGoldenResourcePids(all);
-	}
-
-	private List<Long> deleteEmpiLinksAndReturnGoldenResourcePids(List<EmpiLink> theLinks) {
-		Set<Long> persons = theLinks.stream().map(EmpiLink::getSourceResourcePid).collect(Collectors.toSet());
-		//TODO GGG this is probably invalid... we are essentially looking for GOLDEN -> GOLDEN links, which are either POSSIBLE_DUPLICATE
-		//and REDIRECT
-		//persons.addAll(theLinks.stream().filter(link -> "Person".equals(link.getEmpiTargetType())).map(EmpiLink::getTargetPid).collect(Collectors.toSet()));
-		persons.addAll(theLinks.stream()
-			.filter(link -> link.getMatchResult().equals(EmpiMatchResultEnum.REDIRECT)
-				|| link.getMatchResult().equals(EmpiMatchResultEnum.POSSIBLE_DUPLICATE))
-			.map(EmpiLink::getTargetPid).collect(Collectors.toSet()));
-		ourLog.info("Deleting {} EMPI link records...", theLinks.size());
-		myEmpiLinkDao.deleteAll(theLinks);
-		ourLog.info("{} EMPI link records deleted", theLinks.size());
-		return new ArrayList<>(persons);
-	}
-
-	/**
-	 * Given a valid {@link String}, delete all {@link EmpiLink} entities for that type, and get the Pids
-	 * for the Person resources which were the sources of the links.
-	 *
-	 * @param theTargetType the type of relationship you would like to delete.
-	 * @return A list of longs representing the Pids of the Person resources used as the sources of the relationships that were deleted.
-	 */
-	public List<Long> deleteAllEmpiLinksOfTypeAndReturnPersonPids(String theTargetType) {
-		EmpiLink link = new EmpiLink();
-		link.setEmpiTargetType(theTargetType);
-		Example<EmpiLink> exampleLink = Example.of(link);
-		List<EmpiLink> allOfType = myEmpiLinkDao.findAll(exampleLink);
-		return deleteEmpiLinksAndReturnGoldenResourcePids(allOfType);
-	}
-
-	/**
-	 * Persist an EmpiLink to the database.
-	 *
-	 * @param theEmpiLink the link to save.
-	 * @return the persisted {@link EmpiLink} entity.
-	 */
-	public EmpiLink save(EmpiLink theEmpiLink) {
-		if (theEmpiLink.getCreated() == null) {
-			theEmpiLink.setCreated(new Date());
-		}
-		theEmpiLink.setUpdated(new Date());
-		return myEmpiLinkDao.save(theEmpiLink);
-	}
-
-
-	/**
-	 * Given an example {@link EmpiLink}, return all links from the database which match the example.
-	 *
-	 * @param theExampleLink The EmpiLink containing the data we would like to search for.
-	 * @return a list of {@link EmpiLink} entities which match the example.
-	 */
-	public List<EmpiLink> findEmpiLinkByExample(Example<EmpiLink> theExampleLink) {
-		return myEmpiLinkDao.findAll(theExampleLink);
-	}
-
-	/**
-	 * Given a target {@link IBaseResource}, return all {@link EmpiLink} entities in which this target is the target
-	 * of the relationship. This will show you all links for a given Patient/Practitioner.
-	 *
-	 * @param theTargetResource the target resource to find links for.
-	 * @return all links for the target.
-	 */
-	public List<EmpiLink> findEmpiLinksByTarget(IBaseResource theTargetResource) {
-		Long pid = myIdHelperService.getPidOrNull(theTargetResource);
-		if (pid == null) {
-			return Collections.emptyList();
-		}
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink().setTargetPid(pid);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findAll(example);
-	}
-
-	/**
-	 * Finds all links pointing from the target resource to the source resource.
-	 *
-	 * @param theTargetResource Resource referencing the source resource
-	 * @param theSourceResource Resource being referenced by the source resource
-	 *
-	 * @return
-	 * 		Returns all EMPI links pointing to the source from target resource
-	 */
-	public List<EmpiLink> findEmpiLinksByTargetAndSource(IBaseResource theTargetResource, IBaseResource theSourceResource) {
-		Long targetPid = myIdHelperService.getPidOrNull(theTargetResource);
-		if (targetPid == null) {
-			return Collections.emptyList();
-		}
-		Long sourcePid = myIdHelperService.getPidOrNull(theSourceResource);
-		if (sourcePid == null) {
-			return Collections.emptyList();
-		}
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink().setTargetPid(targetPid).setGoldenResourcePid(sourcePid);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findAll(example);
-	}
-
-	/**
-	 * Finds all {@link EmpiLink} entities in which theSourceResource's PID is the source
-	 * of the relationship.
-	 *
-	 * @param theSourceResource the source resource to find links for.
-	 * @return all links for the source.
-	 */
-	public List<EmpiLink> findEmpiMatchLinksBySource(IBaseResource theSourceResource) {
-		Long pid = myIdHelperService.getPidOrNull(theSourceResource);
-		if (pid == null) {
-			return Collections.emptyList();
-		}
-		EmpiLink exampleLink = myEmpiLinkFactory.newEmpiLink().setGoldenResourcePid(pid);
-		exampleLink.setMatchResult(EmpiMatchResultEnum.MATCH);
-		Example<EmpiLink> example = Example.of(exampleLink);
-		return myEmpiLinkDao.findAll(example);
-	}
-
-	/**
-	 * Factory delegation method, whenever you need a new EmpiLink, use this factory method.
-	 * //TODO Should we make the constructor private for EmpiLink? or work out some way to ensure they can only be instantiated via factory.
-	 *
-	 * @return A new {@link EmpiLink}.
-	 */
-	public EmpiLink newEmpiLink() {
-		return myEmpiLinkFactory.newEmpiLink();
-	}
-
-}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiClearSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiClearSvcImpl.java
deleted file mode 100644
index 1c84c64322c..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiClearSvcImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package ca.uhn.fhir.jpa.empi.svc;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.empi.api.IEmpiExpungeSvc;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.jpa.api.model.DeleteMethodOutcome;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
-import ca.uhn.fhir.rest.server.provider.ProviderConstants;
-import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-/**
- * This class is responsible for clearing out existing EMPI links, as well as deleting all persons related to those EMPI Links.
- *
- */
-public class EmpiClearSvcImpl implements IEmpiExpungeSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
-
-	final EmpiLinkDaoSvc myEmpiLinkDaoSvc;
-	final EmpiPersonDeletingSvc myEmpiPersonDeletingSvcImpl;
-	final IEmpiSettings myEmpiSettings;
-
-	@Autowired
-	public EmpiClearSvcImpl(EmpiLinkDaoSvc theEmpiLinkDaoSvc, EmpiPersonDeletingSvc theEmpiPersonDeletingSvcImpl, IEmpiSettings theIEmpiSettings) {
-		myEmpiLinkDaoSvc = theEmpiLinkDaoSvc;
-		myEmpiPersonDeletingSvcImpl = theEmpiPersonDeletingSvcImpl;
-		myEmpiSettings = theIEmpiSettings;
-	}
-
-	@Override
-	public long expungeAllMdmLinksOfTargetType(String theResourceType, ServletRequestDetails theRequestDetails) {
-		throwExceptionIfInvalidTargetType(theResourceType);
-		ourLog.info("Clearing all EMPI Links for resource type {}...", theResourceType);
-		List<Long> personPids = myEmpiLinkDaoSvc.deleteAllEmpiLinksOfTypeAndReturnPersonPids(theResourceType);
-		DeleteMethodOutcome deleteOutcome = myEmpiPersonDeletingSvcImpl.expungePersonPids(personPids, theRequestDetails);
-		ourLog.info("EMPI clear operation complete.  Removed {} EMPI links and {} Person resources.", personPids.size(), deleteOutcome.getExpungedResourcesCount());
-		return personPids.size();
-	}
-
-	private void throwExceptionIfInvalidTargetType(String theResourceType) {
-		if (!myEmpiSettings.isSupportedMdmType(theResourceType)) {
-			throw new InvalidRequestException(ProviderConstants.MDM_CLEAR + " does not support resource type: " + theResourceType);
-		}
-	}
-
-	@Override
-	public long expungeAllEmpiLinks(ServletRequestDetails theRequestDetails) {
-		ourLog.info("Clearing all EMPI Links...");
-		List<Long> personPids = myEmpiLinkDaoSvc.deleteAllEmpiLinksAndReturnGoldenResourcePids();
-		DeleteMethodOutcome deleteOutcome = myEmpiPersonDeletingSvcImpl.expungePersonPids(personPids, theRequestDetails);
-		ourLog.info("EMPI clear operation complete.  Removed {} EMPI links and expunged {} Person resources.", personPids.size(), deleteOutcome.getExpungedResourcesCount());
-		return personPids.size();
-	}
-}
-
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiControllerSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiControllerSvcImpl.java
deleted file mode 100644
index 0036d1b008d..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiControllerSvcImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package ca.uhn.fhir.jpa.empi.svc;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.empi.api.EmpiLinkJson;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiControllerSvc;
-import ca.uhn.fhir.empi.api.IEmpiLinkQuerySvc;
-import ca.uhn.fhir.empi.api.IEmpiLinkUpdaterSvc;
-import ca.uhn.fhir.empi.api.IGoldenResourceMergerSvc;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.provider.EmpiControllerHelper;
-import ca.uhn.fhir.empi.provider.EmpiControllerUtil;
-import ca.uhn.fhir.rest.server.provider.ProviderConstants;
-import org.hl7.fhir.instance.model.api.IAnyResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.stream.Stream;
-
-/**
- * This class acts as a layer between EmpiProviders and EMPI services to support a REST API that's not a FHIR Operation API.
- */
-@Service
-public class EmpiControllerSvcImpl implements IEmpiControllerSvc {
-	@Autowired
-	EmpiControllerHelper myEmpiControllerHelper;
-	@Autowired
-	IGoldenResourceMergerSvc myEmpiPersonMergerSvc;
-	@Autowired
-	IEmpiLinkQuerySvc myEmpiLinkQuerySvc;
-	@Autowired
-	IEmpiLinkUpdaterSvc myIEmpiLinkUpdaterSvc;
-
-	@Override
-	public IAnyResource mergeGoldenResources(String theFromPersonId, String theToPersonId, MdmTransactionContext theMdmTransactionContext) {
-		IAnyResource fromPerson = myEmpiControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_MERGE_GR_FROM_GOLDEN_RESOURCE_ID, theFromPersonId);
-		IAnyResource toPerson = myEmpiControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_MERGE_GR_TO_GOLDEN_RESOURCE_ID, theToPersonId);
-		myEmpiControllerHelper.validateMergeResources(fromPerson, toPerson);
-		myEmpiControllerHelper.validateSameVersion(fromPerson, theFromPersonId);
-		myEmpiControllerHelper.validateSameVersion(toPerson, theToPersonId);
-
-		return myEmpiPersonMergerSvc.mergeGoldenResources(fromPerson, toPerson, theMdmTransactionContext);
-	}
-
-	@Override
-	public Stream<EmpiLinkJson> queryLinks(@Nullable String thePersonId, @Nullable String theTargetId, @Nullable String theMatchResult, @Nullable String theLinkSource, MdmTransactionContext theEmpiContext) {
-		IIdType personId = EmpiControllerUtil.extractPersonIdDtOrNull(ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, thePersonId);
-		IIdType targetId = EmpiControllerUtil.extractTargetIdDtOrNull(ProviderConstants.MDM_QUERY_LINKS_RESOURCE_ID, theTargetId);
-		EmpiMatchResultEnum matchResult = EmpiControllerUtil.extractMatchResultOrNull(theMatchResult);
-		EmpiLinkSourceEnum linkSource = EmpiControllerUtil.extractLinkSourceOrNull(theLinkSource);
-
-		return myEmpiLinkQuerySvc.queryLinks(personId, targetId, matchResult, linkSource, theEmpiContext);
-	}
-
-	@Override
-	public Stream<EmpiLinkJson> getDuplicateGoldenResources(MdmTransactionContext theEmpiContext) {
-		return myEmpiLinkQuerySvc.getDuplicatePersons(theEmpiContext);
-	}
-
-	@Override
-	public IAnyResource updateLink(String theGoldenResourceId, String theTargetId, String theMatchResult, MdmTransactionContext theEmpiContext) {
-		EmpiMatchResultEnum matchResult = EmpiControllerUtil.extractMatchResultOrNull(theMatchResult);
-		IAnyResource person = myEmpiControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, theGoldenResourceId);
-		IAnyResource target = myEmpiControllerHelper.getLatestTargetFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_RESOURCE_ID, theTargetId);
-		myEmpiControllerHelper.validateSameVersion(person, theGoldenResourceId);
-		myEmpiControllerHelper.validateSameVersion(target, theTargetId);
-
-		return myIEmpiLinkUpdaterSvc.updateLink(person, target, matchResult, theEmpiContext);
-	}
-
-	@Override
-	public void notDuplicateGoldenResource(String thePersonId, String theTargetPersonId, MdmTransactionContext theEmpiContext) {
-		IAnyResource person = myEmpiControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, thePersonId);
-		IAnyResource target = myEmpiControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_RESOURCE_ID, theTargetPersonId);
-
-		myIEmpiLinkUpdaterSvc.notDuplicatePerson(person, target, theEmpiContext);
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcImpl.java
deleted file mode 100644
index 79100f79a71..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package ca.uhn.fhir.jpa.empi.svc;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.util.AssuranceLevelUtil;
-import ca.uhn.fhir.empi.util.PersonHelper;
-import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import org.hl7.fhir.instance.model.api.IAnyResource;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.Optional;
-
-/**
- * This class is in charge of managing EmpiLinks between Persons and target resources
- */
-@Service
-public class EmpiLinkSvcImpl implements IEmpiLinkSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
-
-	@Autowired
-	private EmpiResourceDaoSvc myEmpiResourceDaoSvc;
-	@Autowired
-	private EmpiLinkDaoSvc myEmpiLinkDaoSvc;
-	@Autowired
-	private PersonHelper myPersonHelper;
-	@Autowired
-	private IdHelperService myIdHelperService;
-
-	@Override
-	@Transactional
-	public void updateLink(IAnyResource thePerson, IAnyResource theTarget, EmpiMatchOutcome theMatchOutcome, EmpiLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext) {
-		IIdType resourceId = theTarget.getIdElement().toUnqualifiedVersionless();
-
-		if (theMatchOutcome.isPossibleDuplicate() && personsLinkedAsNoMatch(thePerson, theTarget)) {
-			log(theMdmTransactionContext, thePerson.getIdElement().toUnqualifiedVersionless() +
-				" is linked as NO_MATCH with " +
-				theTarget.getIdElement().toUnqualifiedVersionless() +
-				" not linking as POSSIBLE_DUPLICATE.");
-			return;
-		}
-		EmpiMatchResultEnum matchResultEnum = theMatchOutcome.getMatchResultEnum();
-		validateRequestIsLegal(thePerson, theTarget, matchResultEnum, theLinkSource);
-
-//		switch (matchResultEnum) {
-//			case MATCH:
-//				myPersonHelper.addOrUpdateLink(thePerson, resourceId, AssuranceLevelUtil.getAssuranceLevel(matchResultEnum, theLinkSource), theEmpiTransactionContext);
-//				myEmpiResourceDaoSvc.updatePerson(thePerson);
-//				break;
-//			case POSSIBLE_MATCH:
-//				myPersonHelper.addOrUpdateLink(thePerson, resourceId, AssuranceLevelUtil.getAssuranceLevel(matchResultEnum, theLinkSource), theEmpiTransactionContext);
-//				break;
-//			case NO_MATCH:
-//				myPersonHelper.removeLink(thePerson, resourceId, theEmpiTransactionContext);
-//				break;
-//			case POSSIBLE_DUPLICATE:
-//				break;
-//		}
-		myEmpiResourceDaoSvc.upsertSourceResource(thePerson, theMdmTransactionContext.getResourceType());
-		createOrUpdateLinkEntity(thePerson, theTarget, theMatchOutcome, theLinkSource, theMdmTransactionContext);
-	}
-
-	private boolean personsLinkedAsNoMatch(IAnyResource thePerson, IAnyResource theTarget) {
-		Long personId = myIdHelperService.getPidOrThrowException(thePerson);
-		Long targetId = myIdHelperService.getPidOrThrowException(theTarget);
-		// TODO perf collapse into one query
-		return myEmpiLinkDaoSvc.getEmpiLinksByPersonPidTargetPidAndMatchResult(personId, targetId, EmpiMatchResultEnum.NO_MATCH).isPresent() ||
-			myEmpiLinkDaoSvc.getEmpiLinksByPersonPidTargetPidAndMatchResult(targetId, personId, EmpiMatchResultEnum.NO_MATCH).isPresent();
-	}
-
-//	@Override
-//	@Transactional
-//	public void syncEmpiLinksToPersonLinks(IAnyResource thePersonResource, EmpiTransactionContext theEmpiTransactionContext) {
-//		// int origLinkCount = myPersonHelper.getLinkCount(thePersonResource);
-//		int origLinkCount = myEmpiLinkDaoSvc.findEmpiMatchLinksBySource(thePersonResource).size();
-//
-//		List<EmpiLink> empiLinks = myEmpiLinkDaoSvc.findEmpiLinksBySourceResource(thePersonResource);
-//
-//		List<IBaseBackboneElement> newLinks = empiLinks.stream()
-//			.filter(link -> link.isMatch() || link.isPossibleMatch() || link.isRedirect())
-//			.map(this::personLinkFromEmpiLink)
-//			.collect(Collectors.toList());
-//		myPersonHelper.setLinks(thePersonResource, newLinks);
-//		if (newLinks.size() > origLinkCount) {
-//			log(theEmpiTransactionContext, thePersonResource.getIdElement().toVersionless() + " links increased from " + origLinkCount + " to " + newLinks.size());
-//		} else if (newLinks.size() < origLinkCount) {
-//			log(theEmpiTransactionContext, thePersonResource.getIdElement().toVersionless() + " links decreased from " + origLinkCount + " to " + newLinks.size());
-//		}
-//
-//	}
-
-	@Override
-	public void deleteLink(IAnyResource theSourceResource, IAnyResource theTargetResource, MdmTransactionContext theMdmTransactionContext) {
-		// myPersonHelper.removeLink(theExistingPerson, theResource.getIdElement(), theEmpiTransactionContext);
-//		 myEmpiLinkDaoSvc.deleteEmpiLinks(theSourceResource, theTargetResource);
-
-		Optional<EmpiLink> oEmpiLink = getEmpiLinkForPersonTargetPair(theSourceResource, theTargetResource);
-		if (oEmpiLink.isPresent()) {
-			EmpiLink empiLink = oEmpiLink.get();
-			log(theMdmTransactionContext, "Deleting EmpiLink [" + theSourceResource.getIdElement().toVersionless() + " -> " + theTargetResource.getIdElement().toVersionless() + "] with result: " + empiLink.getMatchResult());
-			myEmpiLinkDaoSvc.deleteLink(empiLink);
-		}
-	}
-
-	private IBaseBackboneElement personLinkFromEmpiLink(EmpiLink empiLink) {
-		IIdType resourceId = myIdHelperService.resourceIdFromPidOrThrowException(empiLink.getTargetPid());
-		CanonicalIdentityAssuranceLevel assuranceLevel = AssuranceLevelUtil.getAssuranceLevel(empiLink.getMatchResult(), empiLink.getLinkSource());
-		return myPersonHelper.newPersonLink(resourceId, assuranceLevel);
-	}
-
-	/**
-	 * Helper function which runs various business rules about what types of requests are allowed.
-	 */
-	private void validateRequestIsLegal(IAnyResource thePerson, IAnyResource theResource, EmpiMatchResultEnum theMatchResult, EmpiLinkSourceEnum theLinkSource) {
-		Optional<EmpiLink> oExistingLink = getEmpiLinkForPersonTargetPair(thePerson, theResource);
-		if (oExistingLink.isPresent() && systemIsAttemptingToModifyManualLink(theLinkSource, oExistingLink.get())) {
-			throw new InternalErrorException("EMPI system is not allowed to modify links on manually created links");
-		}
-
-		if (systemIsAttemptingToAddNoMatch(theLinkSource, theMatchResult)) {
-			throw new InternalErrorException("EMPI system is not allowed to automatically NO_MATCH a resource");
-		}
-	}
-
-	/**
-	 * Helper function which detects when the EMPI system is attempting to add a NO_MATCH link, which is not allowed.
-	 */
-	private boolean systemIsAttemptingToAddNoMatch(EmpiLinkSourceEnum theLinkSource, EmpiMatchResultEnum theMatchResult) {
-		return theLinkSource == EmpiLinkSourceEnum.AUTO && theMatchResult == EmpiMatchResultEnum.NO_MATCH;
-	}
-
-	/**
-	 * Helper function to let us catch when System EMPI rules are attempting to override a manually defined link.
-	 */
-	private boolean systemIsAttemptingToModifyManualLink(EmpiLinkSourceEnum theIncomingSource, EmpiLink theExistingSource) {
-		return theIncomingSource == EmpiLinkSourceEnum.AUTO && theExistingSource.isManual();
-	}
-
-	private Optional<EmpiLink> getEmpiLinkForPersonTargetPair(IAnyResource thePerson, IAnyResource theCandidate) {
-		if (thePerson.getIdElement().getIdPart() == null || theCandidate.getIdElement().getIdPart() == null) {
-			return Optional.empty();
-		} else {
-			return myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(
-				myIdHelperService.getPidOrNull(thePerson),
-				myIdHelperService.getPidOrNull(theCandidate)
-			);
-		}
-	}
-
-	private void createOrUpdateLinkEntity(IBaseResource theSourceResource, IBaseResource theTargetResource, EmpiMatchOutcome theMatchOutcome, EmpiLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext) {
-		myEmpiLinkDaoSvc.createOrUpdateLinkEntity(theSourceResource, theTargetResource, theMatchOutcome, theLinkSource, theMdmTransactionContext);
-	}
-
-	private void log(MdmTransactionContext theMdmTransactionContext, String theMessage) {
-		theMdmTransactionContext.addTransactionLogMessage(theMessage);
-		ourLog.debug(theMessage);
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvc.java
deleted file mode 100644
index 4e7a86d409c..00000000000
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvc.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package ca.uhn.fhir.jpa.empi.svc;
-
-/*-
- * #%L
- * HAPI FHIR JPA Server - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.empi.util.PersonHelper;
-import ca.uhn.fhir.jpa.empi.svc.candidate.CandidateList;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiSourceResourceFindingSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.MatchedSourceResourceCandidate;
-import ca.uhn.fhir.rest.server.TransactionLogMessages;
-import org.hl7.fhir.instance.model.api.IAnyResource;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * EmpiMatchLinkSvc is the entrypoint for HAPI's EMPI system. An incoming resource can call
- * updateEmpiLinksForEmpiTarget and the underlying EMPI system will take care of matching it to a person, or creating a
- * new Person if a suitable one was not found.
- */
-@Service
-public class EmpiMatchLinkSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
-
-	@Autowired
-	private IEmpiLinkSvc myEmpiLinkSvc;
-	@Autowired
-	private EmpiSourceResourceFindingSvc myEmpiSourceResourceFindingSvc;
-	@Autowired
-	private PersonHelper myGoldenResourceHelper;
-	@Autowired
-	private EmpiEidUpdateService myEidUpdateService;
-
-	/**
-	 * Given an Empi Target (consisting of either a Patient or a Practitioner), find a suitable Person candidate for them,
-	 * or create one if one does not exist. Performs matching based on rules defined in empi-rules.json.
-	 * Does nothing if resource is determined to be not managed by EMPI.
-	 *
-	 * @param theResource the incoming EMPI target, which is either a Patient or Practitioner.
-	 * @param theMdmTransactionContext
-	 * @return an {@link TransactionLogMessages} which contains all informational messages related to EMPI processing of this resource.
-	 */
-	public MdmTransactionContext updateEmpiLinksForEmpiTarget(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
-		if (EmpiUtil.isEmpiAccessible(theResource)) {
-			return doEmpiUpdate(theResource, theMdmTransactionContext);
-		} else {
-			return null;
-		}
-	}
-
-	private MdmTransactionContext doEmpiUpdate(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
-		CandidateList candidateList = myEmpiSourceResourceFindingSvc.findSourceResourceCandidates(theResource);
-
-		if (candidateList.isEmpty()) {
-			handleEmpiWithNoCandidates(theResource, theMdmTransactionContext);
-		} else if (candidateList.exactlyOneMatch()) {
-			handleEmpiWithSingleCandidate(theResource, candidateList.getOnlyMatch(), theMdmTransactionContext);
-		} else {
-			handleEmpiWithMultipleCandidates(theResource, candidateList, theMdmTransactionContext);
-		}
-		return theMdmTransactionContext;
-	}
-
-	private void handleEmpiWithMultipleCandidates(IAnyResource theResource, CandidateList theCandidateList, MdmTransactionContext theMdmTransactionContext) {
-		MatchedSourceResourceCandidate firstMatch = theCandidateList.getFirstMatch();
-		Long samplePersonPid = firstMatch.getCandidatePersonPid().getIdAsLong();
-		boolean allSamePerson = theCandidateList.stream()
-			.allMatch(candidate -> candidate.getCandidatePersonPid().getIdAsLong().equals(samplePersonPid));
-
-		if (allSamePerson) {
-			log(theMdmTransactionContext, "EMPI received multiple match candidates, but they are all linked to the same person.");
-			handleEmpiWithSingleCandidate(theResource, firstMatch, theMdmTransactionContext);
-		} else {
-			log(theMdmTransactionContext, "EMPI received multiple match candidates, that were linked to different Persons. Setting POSSIBLE_DUPLICATES and POSSIBLE_MATCHES.");
-			//Set them all as POSSIBLE_MATCH
-			List<IAnyResource> persons = new ArrayList<>();
-			for (MatchedSourceResourceCandidate matchedSourceResourceCandidate : theCandidateList.getCandidates()) {
-				IAnyResource person = myEmpiSourceResourceFindingSvc
-					.getSourceResourceFromMatchedSourceResourceCandidate(matchedSourceResourceCandidate, theMdmTransactionContext.getResourceType());
-				EmpiMatchOutcome outcome = EmpiMatchOutcome.POSSIBLE_MATCH;
-				outcome.setEidMatch(theCandidateList.isEidMatch());
-				myEmpiLinkSvc.updateLink(person, theResource, outcome, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-				persons.add(person);
-			}
-
-			//Set all Persons as POSSIBLE_DUPLICATE of the last person.
-			IAnyResource firstPerson = persons.get(0);
-			persons.subList(1, persons.size())
-				.forEach(possibleDuplicatePerson -> {
-					EmpiMatchOutcome outcome = EmpiMatchOutcome.POSSIBLE_DUPLICATE;
-					outcome.setEidMatch(theCandidateList.isEidMatch());
-					myEmpiLinkSvc.updateLink(firstPerson, possibleDuplicatePerson, outcome, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-				});
-		}
-	}
-
-	private void handleEmpiWithNoCandidates(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
-		log(theMdmTransactionContext, String.format("There were no matched candidates for EMPI, creating a new %s.", theResource.getIdElement().getResourceType()));
-		IAnyResource newPerson = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(theResource);
-		// TODO GGG :)
-		// 1. Get the right helper
-		// 2. Create source resoruce for the EMPI target
-		// 3. UPDATE EMPI LINK TABLE
-
-		myEmpiLinkSvc.updateLink(newPerson, theResource, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-	}
-
-	private void handleEmpiCreate(IAnyResource theTargetResource, MatchedSourceResourceCandidate thePersonCandidate, MdmTransactionContext theMdmTransactionContext) {
-		log(theMdmTransactionContext, "EMPI has narrowed down to one candidate for matching.");
-		IAnyResource sourceResource = myEmpiSourceResourceFindingSvc.getSourceResourceFromMatchedSourceResourceCandidate(thePersonCandidate, theMdmTransactionContext.getResourceType());
-
-		if (myGoldenResourceHelper.isPotentialDuplicate(sourceResource, theTargetResource)) {
-			log(theMdmTransactionContext, "Duplicate detected based on the fact that both resources have different external EIDs.");
-			IAnyResource newSourceResource = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(theTargetResource);
-			myEmpiLinkSvc.updateLink(newSourceResource, theTargetResource, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-			myEmpiLinkSvc.updateLink(newSourceResource, sourceResource, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-		} else {
-			if (thePersonCandidate.isMatch()) {
-				myGoldenResourceHelper.handleExternalEidAddition(sourceResource, theTargetResource, theMdmTransactionContext);
-				// myPersonHelper.updatePersonFromNewlyCreatedEmpiTarget(person, theResource, theEmpiTransactionContext);
-			}
-			myEmpiLinkSvc.updateLink(sourceResource, theTargetResource, thePersonCandidate.getMatchResult(), EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-		}
-	}
-
-	private void handleEmpiWithSingleCandidate(IAnyResource theResource, MatchedSourceResourceCandidate thePersonCandidate, MdmTransactionContext theMdmTransactionContext) {
-		log(theMdmTransactionContext, "EMPI has narrowed down to one candidate for matching.");
-		if (theMdmTransactionContext.getRestOperation().equals(MdmTransactionContext.OperationType.UPDATE_RESOURCE)) {
-			myEidUpdateService.handleEmpiUpdate(theResource, thePersonCandidate, theMdmTransactionContext);
-		} else {
-			handleEmpiCreate(theResource, thePersonCandidate, theMdmTransactionContext);
-		}
-	}
-
-	private void log(MdmTransactionContext theMdmTransactionContext, String theMessage) {
-		theMdmTransactionContext.addTransactionLogMessage(theMessage);
-		ourLog.debug(theMessage);
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiMessageHandler.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java
similarity index 60%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiMessageHandler.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java
index 814ef671df0..1f9c3bdc60e 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiMessageHandler.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.broker;
+package ca.uhn.fhir.jpa.mdm.broker;
 
 /*-
  * #%L
@@ -21,14 +21,14 @@ package ca.uhn.fhir.jpa.empi.broker;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.interceptor.api.HookParams;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
 import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.empi.svc.EmpiMatchLinkSvc;
-import ca.uhn.fhir.jpa.empi.svc.EmpiResourceFilteringSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmMatchLinkSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmResourceFilteringSvc;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedMessage;
 import ca.uhn.fhir.rest.server.TransactionLogMessages;
@@ -43,19 +43,19 @@ import org.springframework.messaging.MessagingException;
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmpiMessageHandler implements MessageHandler {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmMessageHandler implements MessageHandler {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private EmpiMatchLinkSvc myEmpiMatchLinkSvc;
+	private MdmMatchLinkSvc myMdmMatchLinkSvc;
 	@Autowired
 	private IInterceptorBroadcaster myInterceptorBroadcaster;
 	@Autowired
 	private FhirContext myFhirContext;
 	@Autowired
-	private EmpiResourceFilteringSvc myEmpiResourceFilteringSvc;
+	private MdmResourceFilteringSvc myMdmResourceFilteringSvc;
 	@Autowired
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myMdmSettings;
 
 	@Override
 	public void handleMessage(Message<?> theMessage) throws MessagingException {
@@ -68,75 +68,75 @@ public class EmpiMessageHandler implements MessageHandler {
 
 		ResourceModifiedMessage msg = ((ResourceModifiedJsonMessage) theMessage).getPayload();
 		try {
-			if (myEmpiResourceFilteringSvc.shouldBeProcessed(getResourceFromPayload(msg))) {
-				matchEmpiAndUpdateLinks(msg);
+			if (myMdmResourceFilteringSvc.shouldBeProcessed(getResourceFromPayload(msg))) {
+				matchMdmAndUpdateLinks(msg);
 			}
 		} catch (Exception e) {
-			ourLog.error("Failed to handle EMPI Matching Resource:", e);
+			ourLog.error("Failed to handle MDM Matching Resource:", e);
 			throw e;
 		}
 	}
-	public void matchEmpiAndUpdateLinks(ResourceModifiedMessage theMsg) {
+	public void matchMdmAndUpdateLinks(ResourceModifiedMessage theMsg) {
 		String resourceType = theMsg.getId(myFhirContext).getResourceType();
 		validateResourceType(resourceType);
-		MdmTransactionContext empiContext =  createEmpiContext(theMsg, resourceType);
+		MdmTransactionContext mdmContext =  createMdmContext(theMsg, resourceType);
 		try {
 			switch (theMsg.getOperationType()) {
 				case CREATE:
-					handleCreatePatientOrPractitioner(theMsg, empiContext);
+					handleCreatePatientOrPractitioner(theMsg, mdmContext);
 					break;
 				case UPDATE:
 				case MANUALLY_TRIGGERED:
-					handleUpdatePatientOrPractitioner(theMsg, empiContext);
+					handleUpdatePatientOrPractitioner(theMsg, mdmContext);
 					break;
 				case DELETE:
 				default:
 					ourLog.trace("Not processing modified message for {}", theMsg.getOperationType());
 			}
 		}catch (Exception e) {
-			log(empiContext, "Failure during EMPI processing: " + e.getMessage(), e);
+			log(mdmContext, "Failure during MDM processing: " + e.getMessage(), e);
 		} finally {
 
-			// Interceptor call: EMPI_AFTER_PERSISTED_RESOURCE_CHECKED
+			// Interceptor call: MDM_AFTER_PERSISTED_RESOURCE_CHECKED
 			ResourceOperationMessage outgoingMsg = new ResourceOperationMessage(myFhirContext, theMsg.getPayload(myFhirContext), theMsg.getOperationType());
 			outgoingMsg.setTransactionId(theMsg.getTransactionId());
 
 			HookParams params = new HookParams()
 				.add(ResourceOperationMessage.class, outgoingMsg)
-				.add(TransactionLogMessages.class, empiContext.getTransactionLogMessages());
-			myInterceptorBroadcaster.callHooks(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED, params);
+				.add(TransactionLogMessages.class, mdmContext.getTransactionLogMessages());
+			myInterceptorBroadcaster.callHooks(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED, params);
 		}
 	}
 
-	private MdmTransactionContext createEmpiContext(ResourceModifiedMessage theMsg, String theResourceType) {
+	private MdmTransactionContext createMdmContext(ResourceModifiedMessage theMsg, String theResourceType) {
 		TransactionLogMessages transactionLogMessages = TransactionLogMessages.createFromTransactionGuid(theMsg.getTransactionId());
-		MdmTransactionContext.OperationType empiOperation;
+		MdmTransactionContext.OperationType mdmOperation;
 		switch (theMsg.getOperationType()) {
 			case CREATE:
-				empiOperation = MdmTransactionContext.OperationType.CREATE_RESOURCE;
+				mdmOperation = MdmTransactionContext.OperationType.CREATE_RESOURCE;
 				break;
 			case UPDATE:
-				empiOperation = MdmTransactionContext.OperationType.UPDATE_RESOURCE;
+				mdmOperation = MdmTransactionContext.OperationType.UPDATE_RESOURCE;
 				break;
 			case MANUALLY_TRIGGERED:
-				empiOperation = MdmTransactionContext.OperationType.SUBMIT_RESOURCE_TO_EMPI;
+				mdmOperation = MdmTransactionContext.OperationType.SUBMIT_RESOURCE_TO_MDM;
 				break;
 			case DELETE:
 			default:
-				ourLog.trace("Not creating an EmpiTransactionContext for {}", theMsg.getOperationType());
-				throw new InvalidRequestException("We can't handle non-update/create operations in EMPI");
+				ourLog.trace("Not creating an MdmTransactionContext for {}", theMsg.getOperationType());
+				throw new InvalidRequestException("We can't handle non-update/create operations in MDM");
 		}
-		return new MdmTransactionContext(transactionLogMessages, empiOperation, theResourceType);
+		return new MdmTransactionContext(transactionLogMessages, mdmOperation, theResourceType);
 	}
 
 	private void validateResourceType(String theResourceType) {
-		if (!myEmpiSettings.isSupportedMdmType(theResourceType)) {
-			throw new IllegalStateException("Unsupported resource type submitted to EMPI matching queue: " + theResourceType);
+		if (!myMdmSettings.isSupportedMdmType(theResourceType)) {
+			throw new IllegalStateException("Unsupported resource type submitted to MDM matching queue: " + theResourceType);
 		}
 	}
 
 	private void handleCreatePatientOrPractitioner(ResourceModifiedMessage theMsg, MdmTransactionContext theMdmTransactionContext) {
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(getResourceFromPayload(theMsg), theMdmTransactionContext);
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(getResourceFromPayload(theMsg), theMdmTransactionContext);
 	}
 
 	private IAnyResource getResourceFromPayload(ResourceModifiedMessage theMsg) {
@@ -144,16 +144,16 @@ public class EmpiMessageHandler implements MessageHandler {
 	}
 
 	private void handleUpdatePatientOrPractitioner(ResourceModifiedMessage theMsg, MdmTransactionContext theMdmTransactionContext) {
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(getResourceFromPayload(theMsg), theMdmTransactionContext);
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(getResourceFromPayload(theMsg), theMdmTransactionContext);
 	}
 
-	private void log(MdmTransactionContext theEmpiContext, String theMessage) {
-		theEmpiContext.addTransactionLogMessage(theMessage);
+	private void log(MdmTransactionContext theMdmContext, String theMessage) {
+		theMdmContext.addTransactionLogMessage(theMessage);
 		ourLog.debug(theMessage);
 	}
 
-	private void log(MdmTransactionContext theEmpiContext, String theMessage, Exception theException) {
-		theEmpiContext.addTransactionLogMessage(theMessage);
+	private void log(MdmTransactionContext theMdmContext, String theMessage, Exception theException) {
+		theMdmContext.addTransactionLogMessage(theMessage);
 		ourLog.error(theMessage, theException);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiQueueConsumerLoader.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java
similarity index 54%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiQueueConsumerLoader.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java
index b6c5350e336..cc92a10fbd2 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/broker/EmpiQueueConsumerLoader.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.jpa.empi.broker;
+package ca.uhn.fhir.jpa.mdm.broker;
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelReceiver;
@@ -35,29 +35,29 @@ import javax.annotation.PreDestroy;
  */
 
 @Service
-public class EmpiQueueConsumerLoader {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmQueueConsumerLoader {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private EmpiMessageHandler myEmpiMessageHandler;
+	private MdmMessageHandler myMdmMessageHandler;
 	@Autowired
 	private IChannelFactory myChannelFactory;
 	@Autowired
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myMdmSettings;
 
-	protected IChannelReceiver myEmpiChannel;
+	protected IChannelReceiver myMdmChannel;
 
 	@PostConstruct
-	public void startListeningToEmpiChannel() {
-		if (myEmpiChannel == null) {
+	public void startListeningToMdmChannel() {
+		if (myMdmChannel == null) {
 			ChannelConsumerSettings config = new ChannelConsumerSettings();
-			config.setConcurrentConsumers(myEmpiSettings.getConcurrentConsumers());
-			myEmpiChannel = myChannelFactory.getOrCreateReceiver(IEmpiSettings.EMPI_CHANNEL_NAME, ResourceModifiedJsonMessage.class, config);
-			if (myEmpiChannel == null) {
-				ourLog.error("Unable to create receiver for {}", IEmpiSettings.EMPI_CHANNEL_NAME);
+			config.setConcurrentConsumers(myMdmSettings.getConcurrentConsumers());
+			myMdmChannel = myChannelFactory.getOrCreateReceiver(IMdmSettings.MDM_CHANNEL_NAME, ResourceModifiedJsonMessage.class, config);
+			if (myMdmChannel == null) {
+				ourLog.error("Unable to create receiver for {}", IMdmSettings.MDM_CHANNEL_NAME);
 			} else {
-				myEmpiChannel.subscribe(myEmpiMessageHandler);
-				ourLog.info("EMPI Matching Consumer subscribed to Matching Channel {} with name {}", myEmpiChannel.getClass().getName(), myEmpiChannel.getName());
+				myMdmChannel.subscribe(myMdmMessageHandler);
+				ourLog.info("MDM Matching Consumer subscribed to Matching Channel {} with name {}", myMdmChannel.getClass().getName(), myMdmChannel.getName());
 			}
 		}
 	}
@@ -65,14 +65,14 @@ public class EmpiQueueConsumerLoader {
 	@SuppressWarnings("unused")
 	@PreDestroy
 	public void stop() {
-		if (myEmpiChannel != null) {
-			myEmpiChannel.unsubscribe(myEmpiMessageHandler);
-			ourLog.info("EMPI Matching Consumer unsubscribed from Matching Channel {} with name {}", myEmpiChannel.getClass().getName(), myEmpiChannel.getName());
+		if (myMdmChannel != null) {
+			myMdmChannel.unsubscribe(myMdmMessageHandler);
+			ourLog.info("MDM Matching Consumer unsubscribed from Matching Channel {} with name {}", myMdmChannel.getClass().getName(), myMdmChannel.getName());
 		}
 	}
 
 	@VisibleForTesting
-	public IChannelReceiver getEmpiChannelForUnitTest() {
-		return myEmpiChannel;
+	public IChannelReceiver getMdmChannelForUnitTest() {
+		return myMdmChannel;
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java
new file mode 100644
index 00000000000..591912f49d1
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java
@@ -0,0 +1,240 @@
+package ca.uhn.fhir.jpa.mdm.config;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
+import ca.uhn.fhir.mdm.api.IMdmExpungeSvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkQuerySvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkUpdaterSvc;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.IGoldenResourceMergerSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.provider.MdmControllerHelper;
+import ca.uhn.fhir.mdm.provider.MdmProviderLoader;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.mdm.util.MessageHelper;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
+import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDeleteSvc;
+import ca.uhn.fhir.jpa.mdm.broker.MdmMessageHandler;
+import ca.uhn.fhir.jpa.mdm.broker.MdmQueueConsumerLoader;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkFactory;
+import ca.uhn.fhir.jpa.mdm.interceptor.MdmStorageInterceptor;
+import ca.uhn.fhir.jpa.mdm.interceptor.IMdmStorageInterceptor;
+import ca.uhn.fhir.jpa.mdm.svc.MdmClearSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmControllerSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmEidUpdateService;
+import ca.uhn.fhir.jpa.mdm.svc.MdmLinkQuerySvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmLinkSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmLinkUpdaterSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmMatchFinderSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmMatchLinkSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmGoldenResourceDeletingSvc;
+import ca.uhn.fhir.jpa.mdm.svc.GoldenResourceMergerSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmResourceDaoSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmResourceFilteringSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchCriteriaBuilderSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmGoldenResourceFindingSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.FindCandidateByEidSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.FindCandidateByLinkSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.FindCandidateByScoreSvc;
+import ca.uhn.fhir.rest.server.util.ISearchParamRetriever;
+import ca.uhn.fhir.validation.IResourceLoader;
+import org.slf4j.Logger;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MdmConsumerConfig {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
+
+	@Bean
+	IMdmStorageInterceptor mdmStorageInterceptor() {
+		return new MdmStorageInterceptor();
+	}
+
+	@Bean
+	MdmQueueConsumerLoader mdmQueueConsumerLoader() {
+		return new MdmQueueConsumerLoader();
+	}
+
+	@Bean
+	MdmMessageHandler mdmMessageHandler() {
+		return new MdmMessageHandler();
+	}
+
+	@Bean
+	MdmMatchLinkSvc mdmMatchLinkSvc() {
+		return new MdmMatchLinkSvc();
+	}
+
+	@Bean
+	MdmEidUpdateService eidUpdateService() {
+		return new MdmEidUpdateService();
+	}
+
+	@Bean
+	MdmResourceDaoSvc mdmResourceDaoSvc() {
+		return new MdmResourceDaoSvc();
+	}
+
+	@Bean
+	IMdmLinkSvc mdmLinkSvc() {
+		return new MdmLinkSvcImpl();
+	}
+
+	@Bean
+	GoldenResourceHelper goldenResourceHelper(FhirContext theFhirContext) {
+		return new GoldenResourceHelper(theFhirContext);
+	}
+
+	@Bean
+	MessageHelper messageHelper(IMdmSettings theMdmSettings, FhirContext theFhirContext) {
+		return new MessageHelper(theMdmSettings, theFhirContext);
+	}
+
+	@Bean
+	MdmSubscriptionLoader mdmSubscriptionLoader() {
+		return new MdmSubscriptionLoader();
+	}
+
+	@Bean
+	MdmSearchParameterLoader mdmSearchParameterLoader() {
+		return new MdmSearchParameterLoader();
+	}
+
+	@Bean
+	MdmGoldenResourceFindingSvc mdmPersonFindingSvc() {
+		return new MdmGoldenResourceFindingSvc();
+	}
+
+	@Bean
+	FindCandidateByEidSvc findCandidateByEidSvc() {
+		return new FindCandidateByEidSvc();
+	}
+
+	@Bean
+	FindCandidateByLinkSvc findCandidateByLinkSvc() {
+		return new FindCandidateByLinkSvc();
+	}
+
+	@Bean
+	FindCandidateByScoreSvc findCandidateByScoreSvc() {
+		return new FindCandidateByScoreSvc();
+	}
+
+	@Bean
+	MdmProviderLoader mdmProviderLoader() {
+		return new MdmProviderLoader();
+	}
+
+	@Bean
+	MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext, ISearchParamRetriever theSearchParamRetriever) {
+		return new MdmRuleValidator(theFhirContext, theSearchParamRetriever);
+	}
+
+	@Bean
+	IMdmMatchFinderSvc mdmMatchFinderSvc() {
+		return new MdmMatchFinderSvcImpl();
+	}
+
+	@Bean
+	IGoldenResourceMergerSvc mdmPersonMergerSvc() {
+		return new GoldenResourceMergerSvcImpl();
+	}
+
+
+	@Bean
+	IMdmLinkQuerySvc mdmLinkQuerySvc() {
+		return new MdmLinkQuerySvcImpl();
+	}
+
+	@Bean
+	IMdmExpungeSvc mdmResetSvc(MdmLinkDaoSvc theMdmLinkDaoSvc, MdmGoldenResourceDeletingSvc theDeletingSvc, IMdmSettings theIMdmSettings) {
+		return new MdmClearSvcImpl(theMdmLinkDaoSvc, theDeletingSvc, theIMdmSettings);
+	}
+
+	@Bean
+	MdmCandidateSearchSvc mdmCandidateSearchSvc() {
+		return new MdmCandidateSearchSvc();
+	}
+
+	@Bean
+	MdmCandidateSearchCriteriaBuilderSvc mdmCriteriaBuilderSvc() {
+		return new MdmCandidateSearchCriteriaBuilderSvc();
+	}
+
+	@Bean
+	MdmResourceMatcherSvc mdmResourceComparatorSvc(FhirContext theFhirContext, IMdmSettings theMdmSettings) {
+		return new MdmResourceMatcherSvc(theFhirContext, theMdmSettings);
+	}
+
+	@Bean
+	EIDHelper eidHelper(FhirContext theFhirContext, IMdmSettings theMdmSettings) {
+		return new EIDHelper(theFhirContext, theMdmSettings);
+	}
+
+	@Bean
+	MdmLinkDaoSvc mdmLinkDaoSvc() {
+		return new MdmLinkDaoSvc();
+	}
+
+	@Bean
+	MdmLinkFactory mdmLinkFactory(IMdmSettings theMdmSettings) {
+		return new MdmLinkFactory(theMdmSettings);
+	}
+
+	@Bean
+	IMdmLinkUpdaterSvc mdmLinkUpdaterSvc() {
+		return new MdmLinkUpdaterSvcImpl();
+	}
+
+	@Bean
+	MdmLoader mdmLoader() {
+		return new MdmLoader();
+	}
+
+	@Bean
+	MdmLinkDeleteSvc mdmLinkDeleteSvc() {
+		return new MdmLinkDeleteSvc();
+	}
+
+	@Bean
+	MdmResourceFilteringSvc mdmResourceFilteringSvc() {
+		return new MdmResourceFilteringSvc();
+	}
+
+	@Bean
+	MdmControllerHelper mdmProviderHelper(FhirContext theFhirContext, IResourceLoader theResourceLoader, IMdmSettings theMdmSettings, MessageHelper messageHelper) {
+		return new MdmControllerHelper(theFhirContext, theResourceLoader, theMdmSettings, messageHelper);
+	}
+
+	@Bean
+	IMdmControllerSvc mdmControllerSvc() {
+		return new MdmControllerSvcImpl();
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiLoader.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java
similarity index 59%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiLoader.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java
index 46fd60ecf9f..4902541bc47 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiLoader.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.config;
+package ca.uhn.fhir.jpa.mdm.config;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.empi.config;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.provider.EmpiProviderLoader;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.provider.MdmProviderLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,34 +31,35 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmpiLoader {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiLoader.class);
+public class MdmLoader {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmLoader.class);
 
 	@Autowired
-	IEmpiSettings myEmpiProperties;
+	IMdmSettings myMdmSettings;
 	@Autowired
-	EmpiProviderLoader myEmpiProviderLoader;
+	MdmProviderLoader myMdmProviderLoader;
 	@Autowired
-	EmpiSubscriptionLoader myEmpiSubscriptionLoader;
+	MdmSubscriptionLoader myMdmSubscriptionLoader;
 	@Autowired
-	EmpiSearchParameterLoader myEmpiSearchParameterLoader;
+	MdmSearchParameterLoader myMdmSearchParameterLoader;
 
 	@EventListener(classes = {ContextRefreshedEvent.class})
 	// This @Order is here to ensure that MatchingQueueSubscriberLoader has initialized before we initialize this.
-	// Otherwise the EMPI subscriptions won't get loaded into the SubscriptionRegistry
+	// Otherwise the MDM subscriptions won't get loaded into the SubscriptionRegistry
 	@Order
 	public void updateSubscriptions() {
-		if (!myEmpiProperties.isEnabled()) {
+		if (!myMdmSettings.isEnabled()) {
 			return;
 		}
 
-		myEmpiProviderLoader.loadProvider();
-		ourLog.info("EMPI provider registered");
+		myMdmProviderLoader.loadProvider();
+		ourLog.info("MDM provider registered");
 
-		myEmpiSubscriptionLoader.daoUpdateEmpiSubscriptions();
-		ourLog.info("EMPI subscriptions updated");
+		myMdmSubscriptionLoader.daoUpdateMdmSubscriptions();
+		ourLog.info("MDM subscriptions updated");
 
-		myEmpiSearchParameterLoader.daoUpdateEmpiSearchParameters();
-		ourLog.info("EMPI search parameters updated");
+		//TODO GGG MDM: Do we need these search parameters, or equivalent, anymore? Don't think so... ask @fil512
+		myMdmSearchParameterLoader.daoUpdateMdmSearchParameters();
+		ourLog.info("MDM search parameters updated");
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSearchParameterLoader.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java
similarity index 66%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSearchParameterLoader.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java
index 04cbfcbebd2..7d447fe61e7 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSearchParameterLoader.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.config;
+package ca.uhn.fhir.jpa.mdm.config;
 
 /*-
  * #%L
@@ -22,7 +22,7 @@ package ca.uhn.fhir.jpa.empi.config;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
+import ca.uhn.fhir.mdm.api.MdmConstants;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -32,28 +32,28 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmpiSearchParameterLoader {
-	public static final String EMPI_PERSON_ASSURANCE_SEARCH_PARAMETER_ID = "person-assurance";
-	public static final String EMPI_PERSON_ACTIVE_SEARCH_PARAMETER_ID = "person-active";
+public class MdmSearchParameterLoader {
+	public static final String MDM_PERSON_ASSURANCE_SEARCH_PARAMETER_ID = "person-assurance";
+	public static final String MDM_PERSON_ACTIVE_SEARCH_PARAMETER_ID = "person-active";
 	@Autowired
 	public FhirContext myFhirContext;
 	@Autowired
 	public DaoRegistry myDaoRegistry;
 
-	synchronized public void daoUpdateEmpiSearchParameters() {
+	synchronized public void daoUpdateMdmSearchParameters() {
 		IBaseResource personAssurance;
 		IBaseResource personActive;
 		switch (myFhirContext.getVersion().getVersion()) {
 			case DSTU3:
-				personAssurance = buildAssuranceEmpiSearchParameterDstu3();
-				personActive = buildActiveEmpiSearchParameterDstu3();
+				personAssurance = buildAssuranceMdmSearchParameterDstu3();
+				personActive = buildActiveMdmSearchParameterDstu3();
 				break;
 			case R4:
-				personAssurance = buildAssuranceEmpiSearchParameterR4();
-				personActive = buildActiveEmpiSearchParameterR4();
+				personAssurance = buildAssuranceMdmSearchParameterR4();
+				personActive = buildActiveMdmSearchParameterR4();
 				break;
 			default:
-				throw new ConfigurationException("EMPI not supported for FHIR version " + myFhirContext.getVersion().getVersion());
+				throw new ConfigurationException("MDM not supported for FHIR version " + myFhirContext.getVersion().getVersion());
 		}
 
 		IFhirResourceDao<IBaseResource> searchParameterDao = myDaoRegistry.getResourceDao("SearchParameter");
@@ -61,11 +61,11 @@ public class EmpiSearchParameterLoader {
 		searchParameterDao.update(personActive);
 	}
 
-	private org.hl7.fhir.dstu3.model.SearchParameter buildAssuranceEmpiSearchParameterDstu3() {
+	private org.hl7.fhir.dstu3.model.SearchParameter buildAssuranceMdmSearchParameterDstu3() {
 		org.hl7.fhir.dstu3.model.SearchParameter retval = new org.hl7.fhir.dstu3.model.SearchParameter();
-		retval.setId(EMPI_PERSON_ASSURANCE_SEARCH_PARAMETER_ID);
+		retval.setId(MDM_PERSON_ASSURANCE_SEARCH_PARAMETER_ID);
 		retval.setStatus(org.hl7.fhir.dstu3.model.Enumerations.PublicationStatus.ACTIVE);
-		retval.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_HAPI_MDM_MANAGED);
+		retval.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_HAPI_MDM_MANAGED);
 		retval.setCode("assurance");
 		retval.addBase("Person");
 		retval.setType(org.hl7.fhir.dstu3.model.Enumerations.SearchParamType.TOKEN);
@@ -74,11 +74,11 @@ public class EmpiSearchParameterLoader {
 		return retval;
 	}
 
-	private SearchParameter buildAssuranceEmpiSearchParameterR4() {
+	private SearchParameter buildAssuranceMdmSearchParameterR4() {
 		SearchParameter retval = new SearchParameter();
-		retval.setId(EMPI_PERSON_ASSURANCE_SEARCH_PARAMETER_ID);
+		retval.setId(MDM_PERSON_ASSURANCE_SEARCH_PARAMETER_ID);
 		retval.setStatus(Enumerations.PublicationStatus.ACTIVE);
-		retval.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_HAPI_MDM_MANAGED);
+		retval.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_HAPI_MDM_MANAGED);
 		retval.setCode("assurance");
 		retval.addBase("Person");
 		retval.setType(Enumerations.SearchParamType.TOKEN);
@@ -87,11 +87,11 @@ public class EmpiSearchParameterLoader {
 		return retval;
 	}
 
-	private org.hl7.fhir.dstu3.model.SearchParameter buildActiveEmpiSearchParameterDstu3() {
+	private org.hl7.fhir.dstu3.model.SearchParameter buildActiveMdmSearchParameterDstu3() {
 		org.hl7.fhir.dstu3.model.SearchParameter retval = new org.hl7.fhir.dstu3.model.SearchParameter();
-		retval.setId(EMPI_PERSON_ACTIVE_SEARCH_PARAMETER_ID);
+		retval.setId(MDM_PERSON_ACTIVE_SEARCH_PARAMETER_ID);
 		retval.setStatus(org.hl7.fhir.dstu3.model.Enumerations.PublicationStatus.ACTIVE);
-		retval.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_HAPI_MDM_MANAGED);
+		retval.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_HAPI_MDM_MANAGED);
 		retval.setCode("active");
 		retval.addBase("Person");
 		retval.setType(org.hl7.fhir.dstu3.model.Enumerations.SearchParamType.TOKEN);
@@ -100,11 +100,11 @@ public class EmpiSearchParameterLoader {
 		return retval;
 	}
 
-	private SearchParameter buildActiveEmpiSearchParameterR4() {
+	private SearchParameter buildActiveMdmSearchParameterR4() {
 		SearchParameter retval = new SearchParameter();
-		retval.setId(EMPI_PERSON_ACTIVE_SEARCH_PARAMETER_ID);
+		retval.setId(MDM_PERSON_ACTIVE_SEARCH_PARAMETER_ID);
 		retval.setStatus(Enumerations.PublicationStatus.ACTIVE);
-		retval.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_HAPI_MDM_MANAGED);
+		retval.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_HAPI_MDM_MANAGED);
 		retval.setCode("active");
 		retval.addBase("Person");
 		retval.setType(Enumerations.SearchParamType.TOKEN);
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java
new file mode 100644
index 00000000000..609b005558c
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java
@@ -0,0 +1,76 @@
+package ca.uhn.fhir.jpa.mdm.config;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.mdm.api.IMdmChannelSubmitterSvc;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDeleteSvc;
+import ca.uhn.fhir.jpa.mdm.interceptor.MdmSubmitterInterceptorLoader;
+import ca.uhn.fhir.jpa.mdm.svc.MdmChannelSubmitterSvcImpl;
+import ca.uhn.fhir.jpa.mdm.svc.MdmGoldenResourceDeletingSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmSearchParamSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmSubmitSvcImpl;
+import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+@Configuration
+public class MdmSubmitterConfig {
+
+	@Bean
+	MdmSubmitterInterceptorLoader mdmSubmitterInterceptorLoader() {
+		return new MdmSubmitterInterceptorLoader();
+	}
+
+	@Bean
+	MdmSearchParamSvc mdmSearchParamSvc() {
+		return new MdmSearchParamSvc();
+	}
+
+	@Bean
+	MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext) {
+		return new MdmRuleValidator(theFhirContext, mdmSearchParamSvc());
+	}
+
+	@Bean
+	MdmLinkDeleteSvc mdmLinkDeleteSvc() {
+		return new MdmLinkDeleteSvc();
+	}
+
+	@Bean
+	MdmGoldenResourceDeletingSvc mdmGoldenResourceDeletingSvc() {
+		return new MdmGoldenResourceDeletingSvc();
+	}
+
+	@Bean
+	@Lazy
+	IMdmChannelSubmitterSvc mdmChannelSubmitterSvc(FhirContext theFhirContext, IChannelFactory theChannelFactory) {
+		return new MdmChannelSubmitterSvcImpl(theFhirContext, theChannelFactory);
+	}
+
+	@Bean
+	IMdmSubmitSvc mdmBatchService() {
+		return new MdmSubmitSvcImpl();
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubscriptionLoader.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java
similarity index 63%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubscriptionLoader.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java
index 545e9658ba3..2d792f3e4fd 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/config/EmpiSubscriptionLoader.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.config;
+package ca.uhn.fhir.jpa.mdm.config;
 
 /*-
  * #%L
@@ -22,9 +22,9 @@ package ca.uhn.fhir.jpa.empi.config;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
@@ -37,12 +37,14 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-@Service
-public class EmpiSubscriptionLoader {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+import java.util.List;
+import java.util.stream.Collectors;
 
-	public static final String EMPI_PATIENT_SUBSCRIPTION_ID = "empi-patient";
-	public static final String EMPI_PRACTITIONER_SUBSCRIPTION_ID = "empi-practitioner";
+@Service
+public class MdmSubscriptionLoader {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
+
+	public static final String MDM_SUBSCIPRION_ID_PREFIX = "empi-";
 	@Autowired
 	public FhirContext myFhirContext;
 	@Autowired
@@ -51,27 +53,35 @@ public class EmpiSubscriptionLoader {
 	public IdHelperService myIdHelperService;
 	@Autowired
 	IChannelNamer myChannelNamer;
+	@Autowired
+	private IMdmSettings myMdmSettings;
+
 	private IFhirResourceDao<IBaseResource> mySubscriptionDao;
 
-	synchronized public void daoUpdateEmpiSubscriptions() {
-		IBaseResource patientSub;
-		IBaseResource practitionerSub;
+	synchronized public void daoUpdateMdmSubscriptions() {
+		List<IBaseResource> subscriptions;
+		List<String> mdmResourceTypes = myMdmSettings.getMdmRules().getMdmTypes();
 		switch (myFhirContext.getVersion().getVersion()) {
 			case DSTU3:
-				patientSub = buildEmpiSubscriptionDstu3(EMPI_PATIENT_SUBSCRIPTION_ID, "Patient?");
-				practitionerSub = buildEmpiSubscriptionDstu3(EMPI_PRACTITIONER_SUBSCRIPTION_ID, "Practitioner?");
+				subscriptions = mdmResourceTypes
+					.stream()
+					.map(resourceType -> buildMdmSubscriptionDstu3(MDM_SUBSCIPRION_ID_PREFIX + resourceType, resourceType+"?"))
+					.collect(Collectors.toList());
 				break;
 			case R4:
-				patientSub = buildEmpiSubscriptionR4(EMPI_PATIENT_SUBSCRIPTION_ID, "Patient?");
-				practitionerSub = buildEmpiSubscriptionR4(EMPI_PRACTITIONER_SUBSCRIPTION_ID, "Practitioner?");
+				subscriptions = mdmResourceTypes
+					.stream()
+					.map(resourceType -> buildMdmSubscriptionR4(MDM_SUBSCIPRION_ID_PREFIX + resourceType, resourceType+"?"))
+					.collect(Collectors.toList());
 				break;
 			default:
-				throw new ConfigurationException("EMPI not supported for FHIR version " + myFhirContext.getVersion().getVersion());
+				throw new ConfigurationException("MDM not supported for FHIR version " + myFhirContext.getVersion().getVersion());
 		}
 
 		mySubscriptionDao = myDaoRegistry.getResourceDao("Subscription");
-		updateIfNotPresent(patientSub);
-		updateIfNotPresent(practitionerSub);
+		for (IBaseResource subscription : subscriptions) {
+			updateIfNotPresent(subscription);
+		}
 	}
 
 	private synchronized void updateIfNotPresent(IBaseResource theSubscription) {
@@ -83,30 +93,30 @@ public class EmpiSubscriptionLoader {
 		}
 	}
 
-	private org.hl7.fhir.dstu3.model.Subscription buildEmpiSubscriptionDstu3(String theId, String theCriteria) {
+	private org.hl7.fhir.dstu3.model.Subscription buildMdmSubscriptionDstu3(String theId, String theCriteria) {
 		org.hl7.fhir.dstu3.model.Subscription retval = new org.hl7.fhir.dstu3.model.Subscription();
 		retval.setId(theId);
-		retval.setReason("EMPI");
+		retval.setReason("MDM");
 		retval.setStatus(org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus.REQUESTED);
 		retval.setCriteria(theCriteria);
-		retval.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_HAPI_MDM_MANAGED);
+		retval.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_HAPI_MDM_MANAGED);
 		org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelComponent channel = retval.getChannel();
 		channel.setType(org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType.MESSAGE);
-		channel.setEndpoint("channel:" + myChannelNamer.getChannelName(IEmpiSettings.EMPI_CHANNEL_NAME, new ChannelProducerSettings()));
+		channel.setEndpoint("channel:" + myChannelNamer.getChannelName(IMdmSettings.MDM_CHANNEL_NAME, new ChannelProducerSettings()));
 		channel.setPayload("application/json");
 		return retval;
 	}
 
-	private Subscription buildEmpiSubscriptionR4(String theId, String theCriteria) {
+	private Subscription buildMdmSubscriptionR4(String theId, String theCriteria) {
 		Subscription retval = new Subscription();
 		retval.setId(theId);
-		retval.setReason("EMPI");
+		retval.setReason("MDM");
 		retval.setStatus(Subscription.SubscriptionStatus.REQUESTED);
 		retval.setCriteria(theCriteria);
-		retval.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_HAPI_MDM_MANAGED);
+		retval.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_HAPI_MDM_MANAGED);
 		Subscription.SubscriptionChannelComponent channel = retval.getChannel();
 		channel.setType(Subscription.SubscriptionChannelType.MESSAGE);
-		channel.setEndpoint("channel:" + myChannelNamer.getChannelName(IEmpiSettings.EMPI_CHANNEL_NAME, new ChannelProducerSettings()));
+		channel.setEndpoint("channel:" + myChannelNamer.getChannelName(IMdmSettings.MDM_CHANNEL_NAME, new ChannelProducerSettings()));
 		channel.setPayload("application/json");
 		return retval;
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java
new file mode 100644
index 00000000000..2c031f84abb
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java
@@ -0,0 +1,339 @@
+package ca.uhn.fhir.jpa.mdm.dao;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao;
+import ca.uhn.fhir.jpa.dao.index.IdHelperService;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class MdmLinkDaoSvc {
+
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
+
+	@Autowired
+	private IMdmLinkDao myMdmLinkDao;
+	@Autowired
+	private MdmLinkFactory myMdmLinkFactory;
+	@Autowired
+	private IdHelperService myIdHelperService;
+	@Autowired
+	private FhirContext myFhirContext;
+
+	@Transactional
+	public MdmLink createOrUpdateLinkEntity(IBaseResource theSourceResource, IBaseResource theTargetResource, MdmMatchOutcome theMatchOutcome, MdmLinkSourceEnum theLinkSource, @Nullable MdmTransactionContext theMdmTransactionContext) {
+		Long sourceResourcePid = myIdHelperService.getPidOrNull(theSourceResource);
+		Long targetResourcePid = myIdHelperService.getPidOrNull(theTargetResource);
+
+		MdmLink mdmLink = getOrCreateMdmLinkBySourceResourcePidAndTargetResourcePid(sourceResourcePid, targetResourcePid);
+		mdmLink.setLinkSource(theLinkSource);
+		mdmLink.setMatchResult(theMatchOutcome.getMatchResultEnum());
+		// Preserve these flags for link updates
+		mdmLink.setEidMatch(theMatchOutcome.isEidMatch() | mdmLink.isEidMatch());
+		mdmLink.setHadToCreateNewResource(theMatchOutcome.isCreatedNewResource() | mdmLink.getHadToCreateNewResource());
+		mdmLink.setMdmTargetType(myFhirContext.getResourceType(theTargetResource));
+		if (mdmLink.getScore() != null) {
+			mdmLink.setScore(Math.max(theMatchOutcome.score, mdmLink.getScore()));
+		} else {
+			mdmLink.setScore(theMatchOutcome.score);
+		}
+
+		String message = String.format("Creating MdmLink from %s to %s -> %s", theSourceResource.getIdElement().toUnqualifiedVersionless(), theTargetResource.getIdElement().toUnqualifiedVersionless(), theMatchOutcome);
+		theMdmTransactionContext.addTransactionLogMessage(message);
+		ourLog.debug(message);
+		save(mdmLink);
+		return mdmLink;
+	}
+
+	@Nonnull
+	public MdmLink getOrCreateMdmLinkBySourceResourcePidAndTargetResourcePid(Long theSourceResourcePid, Long theTargetResourcePid) {
+		Optional<MdmLink> oExisting = getLinkBySourceResourcePidAndTargetResourcePid(theSourceResourcePid, theTargetResourcePid);
+		if (oExisting.isPresent()) {
+			return oExisting.get();
+		} else {
+			MdmLink newLink = myMdmLinkFactory.newMdmLink();
+			newLink.setGoldenResourcePid(theSourceResourcePid);
+			newLink.setPersonPid(theSourceResourcePid);
+			newLink.setTargetPid(theTargetResourcePid);
+			return newLink;
+		}
+	}
+
+	public Optional<MdmLink> getLinkBySourceResourcePidAndTargetResourcePid(Long theSourceResourcePid, Long theTargetResourcePid) {
+		if (theTargetResourcePid == null || theSourceResourcePid == null) {
+			return Optional.empty();
+		}
+		MdmLink link = myMdmLinkFactory.newMdmLink();
+		link.setTargetPid(theTargetResourcePid);
+		link.setGoldenResourcePid(theSourceResourcePid);
+		Example<MdmLink> example = Example.of(link);
+		return myMdmLinkDao.findOne(example);
+	}
+
+	/**
+	 * Given a Target Pid, and a match result, return all links that match these criteria.
+	 *
+	 * @param theTargetPid   the target of the relationship.
+	 * @param theMatchResult the Match Result of the relationship
+	 * @return a list of {@link MdmLink} entities matching these criteria.
+	 */
+	public List<MdmLink> getMdmLinksByTargetPidAndMatchResult(Long theTargetPid, MdmMatchResultEnum theMatchResult) {
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink();
+		exampleLink.setTargetPid(theTargetPid);
+		exampleLink.setMatchResult(theMatchResult);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findAll(example);
+	}
+
+	/**
+	 * Given a target Pid, return its Matched {@link MdmLink}. There can only ever be at most one of these, but its possible
+	 * the target has no matches, and may return an empty optional.
+	 *
+	 * @param theTargetPid The Pid of the target you wish to find the matching link for.
+	 * @return the {@link MdmLink} that contains the Match information for the target.
+	 */
+	public Optional<MdmLink> getMatchedLinkForTargetPid(Long theTargetPid) {
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink();
+		exampleLink.setTargetPid(theTargetPid);
+		exampleLink.setMatchResult(MdmMatchResultEnum.MATCH);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findOne(example);
+	}
+
+	/**
+	 * Given an IBaseResource, return its Matched {@link MdmLink}. There can only ever be at most one of these, but its possible
+	 * the target has no matches, and may return an empty optional.
+	 *
+	 * @param theTarget The IBaseResource representing the target you wish to find the matching link for.
+	 * @return the {@link MdmLink} that contains the Match information for the target.
+	 */
+	public Optional<MdmLink> getMatchedLinkForTarget(IBaseResource theTarget) {
+		Long pid = myIdHelperService.getPidOrNull(theTarget);
+		if (pid == null) {
+			return Optional.empty();
+		}
+
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink();
+		exampleLink.setTargetPid(pid);
+		exampleLink.setMatchResult(MdmMatchResultEnum.MATCH);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findOne(example);
+	}
+
+	/**
+	 * Given a person a target and a match result, return the matching {@link MdmLink}, if it exists.
+	 *
+	 * @param thePersonPid   The Pid of the Person in the relationship
+	 * @param theTargetPid   The Pid of the target in the relationship
+	 * @param theMatchResult The MatchResult you are looking for.
+	 * @return an Optional {@link MdmLink} containing the matched link if it exists.
+	 */
+	public Optional<MdmLink> getMdmLinksByPersonPidTargetPidAndMatchResult(Long thePersonPid, Long theTargetPid, MdmMatchResultEnum theMatchResult) {
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink();
+		exampleLink.setGoldenResourcePid(thePersonPid);
+		exampleLink.setTargetPid(theTargetPid);
+		exampleLink.setMatchResult(theMatchResult);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findOne(example);
+	}
+
+	/**
+	 * Get all {@link MdmLink} which have {@link MdmMatchResultEnum#POSSIBLE_DUPLICATE} as their match result.
+	 *
+	 * @return A list of {@link MdmLink} that hold potential duplicate persons.
+	 */
+	public List<MdmLink> getPossibleDuplicates() {
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink();
+		exampleLink.setMatchResult(MdmMatchResultEnum.POSSIBLE_DUPLICATE);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findAll(example);
+	}
+
+	public Optional<MdmLink> findMdmLinkByTarget(IBaseResource theTargetResource) {
+		@Nullable Long pid = myIdHelperService.getPidOrNull(theTargetResource);
+		if (pid == null) {
+			return Optional.empty();
+		}
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink().setTargetPid(pid);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findOne(example);
+	}
+
+	/**
+	 * Delete a given {@link MdmLink}. Note that this does not clear out the Golden resource.
+	 * It is a simple entity delete.
+	 *
+	 * @param theMdmLink the {@link MdmLink} to delete.
+	 */
+	@Transactional(propagation = Propagation.REQUIRES_NEW)
+	public void deleteLink(MdmLink theMdmLink) {
+		myMdmLinkDao.delete(theMdmLink);
+	}
+
+	/**
+	 * Given a Golden Resource , return all links in which they are the source Person of the {@link MdmLink}
+	 *
+	 * @param theGoldenResource The {@link IBaseResource} Person who's links you would like to retrieve.
+	 * @return A list of all {@link MdmLink} entities in which theGoldenResource is the source Person.
+	 */
+	public List<MdmLink> findMdmLinksByGoldenResource(IBaseResource theGoldenResource) {
+		Long pid = myIdHelperService.getPidOrNull(theGoldenResource);
+		if (pid == null) {
+			return Collections.emptyList();
+		}
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink().setGoldenResourcePid(pid);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findAll(example);
+	}
+
+	/**
+	 * Delete all {@link MdmLink} entities, and return all resource PIDs from the source of the relationship.
+	 *
+	 * @return A list of Long representing the related Person Pids.
+	 */
+	@Transactional
+	public List<Long> deleteAllMdmLinksAndReturnGoldenResourcePids() {
+		List<MdmLink> all = myMdmLinkDao.findAll();
+		return deleteMdmLinksAndReturnGoldenResourcePids(all);
+	}
+
+	private List<Long> deleteMdmLinksAndReturnGoldenResourcePids(List<MdmLink> theLinks) {
+		Set<Long> persons = theLinks.stream().map(MdmLink::getGoldenResourcePid).collect(Collectors.toSet());
+		//TODO GGG this is probably invalid... we are essentially looking for GOLDEN -> GOLDEN links, which are either POSSIBLE_DUPLICATE
+		//and REDIRECT
+		//persons.addAll(theLinks.stream().filter(link -> "Person".equals(link.getEmpiTargetType())).map(EmpiLink::getTargetPid).collect(Collectors.toSet()));
+		persons.addAll(theLinks.stream()
+			.filter(link -> link.getMatchResult().equals(MdmMatchResultEnum.REDIRECT)
+				|| link.getMatchResult().equals(MdmMatchResultEnum.POSSIBLE_DUPLICATE))
+			.map(MdmLink::getTargetPid).collect(Collectors.toSet()));
+		ourLog.info("Deleting {} MDM link records...", theLinks.size());
+		myMdmLinkDao.deleteAll(theLinks);
+		ourLog.info("{} MDM link records deleted", theLinks.size());
+		return new ArrayList<>(persons);
+	}
+
+	/**
+	 * Given a valid {@link String}, delete all {@link MdmLink} entities for that type, and get the Pids
+	 * for the Person resources which were the sources of the links.
+	 *
+	 * @param theTargetType the type of relationship you would like to delete.
+	 * @return A list of longs representing the Pids of the Person resources used as the sources of the relationships that were deleted.
+	 */
+	public List<Long> deleteAllMdmLinksOfTypeAndReturnGoldenResourcePids(String theTargetType) {
+		MdmLink link = new MdmLink();
+		link.setMdmTargetType(theTargetType);
+		Example<MdmLink> exampleLink = Example.of(link);
+		List<MdmLink> allOfType = myMdmLinkDao.findAll(exampleLink);
+		return deleteMdmLinksAndReturnGoldenResourcePids(allOfType);
+	}
+
+	/**
+	 * Persist an EmpiLink to the database.
+	 *
+	 * @param theMdmLink the link to save.
+	 * @return the persisted {@link MdmLink} entity.
+	 */
+	public MdmLink save(MdmLink theMdmLink) {
+		if (theMdmLink.getCreated() == null) {
+			theMdmLink.setCreated(new Date());
+		}
+		theMdmLink.setUpdated(new Date());
+		return myMdmLinkDao.save(theMdmLink);
+	}
+
+
+	/**
+	 * Given an example {@link MdmLink}, return all links from the database which match the example.
+	 *
+	 * @param theExampleLink The EmpiLink containing the data we would like to search for.
+	 * @return a list of {@link MdmLink} entities which match the example.
+	 */
+	public List<MdmLink> findMdmLinkByExample(Example<MdmLink> theExampleLink) {
+		return myMdmLinkDao.findAll(theExampleLink);
+	}
+
+	/**
+	 * Given a target {@link IBaseResource}, return all {@link MdmLink} entities in which this target is the target
+	 * of the relationship. This will show you all links for a given Patient/Practitioner.
+	 *
+	 * @param theTargetResource the target resource to find links for.
+	 * @return all links for the target.
+	 */
+	public List<MdmLink> findMdmLinksByTarget(IBaseResource theTargetResource) {
+		Long pid = myIdHelperService.getPidOrNull(theTargetResource);
+		if (pid == null) {
+			return Collections.emptyList();
+		}
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink().setTargetPid(pid);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findAll(example);
+	}
+
+	/**
+	 * Finds all {@link MdmLink} entities in which theSourceResource's PID is the source
+	 * of the relationship.
+	 *
+	 * @param theSourceResource the source resource to find links for.
+	 * @return all links for the source.
+	 */
+	public List<MdmLink> findMdmMatchLinksBySource(IBaseResource theSourceResource) {
+		Long pid = myIdHelperService.getPidOrNull(theSourceResource);
+		if (pid == null) {
+			return Collections.emptyList();
+		}
+		MdmLink exampleLink = myMdmLinkFactory.newMdmLink().setGoldenResourcePid(pid);
+		exampleLink.setMatchResult(MdmMatchResultEnum.MATCH);
+		Example<MdmLink> example = Example.of(exampleLink);
+		return myMdmLinkDao.findAll(example);
+	}
+
+	/**
+	 * Factory delegation method, whenever you need a new MdmLink, use this factory method.
+	 * //TODO Should we make the constructor private for MdmLink? or work out some way to ensure they can only be instantiated via factory.
+	 *
+	 * @return A new {@link MdmLink}.
+	 */
+	public MdmLink newMdmLink() {
+		return myMdmLinkFactory.newMdmLink();
+	}
+
+}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkFactory.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java
similarity index 61%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkFactory.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java
index 7e09f99e2db..a3dbb4730ec 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkFactory.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.dao;
+package ca.uhn.fhir.jpa.mdm.dao;
 
 /*-
  * #%L
@@ -20,24 +20,24 @@ package ca.uhn.fhir.jpa.empi.dao;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class EmpiLinkFactory {
-	private final IEmpiSettings myEmpiSettings;
+public class MdmLinkFactory {
+	private final IMdmSettings myMdmSettings;
 
 	@Autowired
-	public EmpiLinkFactory(IEmpiSettings theEmpiSettings) {
-		myEmpiSettings = theEmpiSettings;
+	public MdmLinkFactory(IMdmSettings theMdmSettings) {
+		myMdmSettings = theMdmSettings;
 	}
 
 	/**
-	 * Create a new EmpiLink, populating it with the version of the ruleset used to create it.
+	 * Create a new {@link MdmLink}, populating it with the version of the ruleset used to create it.
 	 *
-	 * @return the new {@link EmpiLink}
+	 * @return the new {@link MdmLink}
 	 */
-	public EmpiLink newEmpiLink() {
-		return new EmpiLink(myEmpiSettings.getRuleVersion());
+	public MdmLink newMdmLink() {
+		return new MdmLink(myMdmSettings.getRuleVersion());
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/IEmpiStorageInterceptor.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java
similarity index 89%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/IEmpiStorageInterceptor.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java
index 50cf4e54a53..68a22d809f4 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/IEmpiStorageInterceptor.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.interceptor;
+package ca.uhn.fhir.jpa.mdm.interceptor;
 
 /*-
  * #%L
@@ -20,5 +20,5 @@ package ca.uhn.fhir.jpa.empi.interceptor;
  * #L%
  */
 
-public interface IEmpiStorageInterceptor {
+public interface IMdmStorageInterceptor {
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptor.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java
similarity index 53%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptor.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java
index 7bcc329cb29..d2311f0aa42 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptor.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.interceptor;
+package ca.uhn.fhir.jpa.mdm.interceptor;
 
 /*-
  * #%L
@@ -21,17 +21,17 @@ package ca.uhn.fhir.jpa.empi.interceptor;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.empi.util.PersonHelper;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
 import ca.uhn.fhir.interceptor.api.Hook;
 import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.dao.empi.EmpiLinkDeleteSvc;
+import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDeleteSvc;
 import ca.uhn.fhir.jpa.dao.expunge.ExpungeEverythingService;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.server.exceptions.ForbiddenOperationException;
 import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
@@ -45,72 +45,72 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
-public class EmpiStorageInterceptor implements IEmpiStorageInterceptor {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiStorageInterceptor.class);
+public class MdmStorageInterceptor implements IMdmStorageInterceptor {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmStorageInterceptor.class);
 	@Autowired
 	private ExpungeEverythingService myExpungeEverythingService;
 	@Autowired
-	private EmpiLinkDeleteSvc myEmpiLinkDeleteSvc;
+	private MdmLinkDeleteSvc myMdmLinkDeleteSvc;
 	@Autowired
 	private FhirContext myFhirContext;
 	@Autowired
 	private EIDHelper myEIDHelper;
 	@Autowired
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myMdmSettings;
 	@Autowired
-	private PersonHelper myPersonHelper;
+	private GoldenResourceHelper myGoldenResourceHelper;
 
 
 	@Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_CREATED)
-	public void blockManualPersonManipulationOnCreate(IBaseResource theBaseResource, RequestDetails theRequestDetails, ServletRequestDetails theServletRequestDetails) {
+	public void blockManualResourceManipulationOnCreate(IBaseResource theBaseResource, RequestDetails theRequestDetails, ServletRequestDetails theServletRequestDetails) {
 
 		//If running in single EID mode, forbid multiple eids.
-		if (myEmpiSettings.isPreventMultipleEids()) {
+		if (myMdmSettings.isPreventMultipleEids()) {
 			forbidIfHasMultipleEids(theBaseResource);
 		}
 
-		// TODO EMPI find a better way to identify EMPI calls
+		// TODO GGG MDM find a better way to identify i nternal calls?
 		if (isInternalRequest(theRequestDetails)) {
 			return;
 		}
 
-		forbidIfEmpiManagedTagIsPresent(theBaseResource);
+		forbidIfMdmManagedTagIsPresent(theBaseResource);
 	}
 
 	@Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_UPDATED)
-	public void blockManualPersonManipulationOnUpdate(IBaseResource theOldResource, IBaseResource theNewResource, RequestDetails theRequestDetails, ServletRequestDetails theServletRequestDetails) {
+	public void blockManualPersonManipulationOnUpdate(IBaseResource theOldResource, IBaseResource theUpdatedResource, RequestDetails theRequestDetails, ServletRequestDetails theServletRequestDetails) {
 
 		//If running in single EID mode, forbid multiple eids.
-		if (myEmpiSettings.isPreventMultipleEids()) {
-			forbidIfHasMultipleEids(theNewResource);
+		if (myMdmSettings.isPreventMultipleEids()) {
+			forbidIfHasMultipleEids(theUpdatedResource);
 		}
 
-		if (EmpiUtil.isEmpiManagedPerson(myFhirContext, theNewResource) &&
-			myPersonHelper.isDeactivated(theNewResource)) {
-			ourLog.debug("Deleting empi links to deactivated Person {}", theNewResource.getIdElement().toUnqualifiedVersionless());
-			int deleted = myEmpiLinkDeleteSvc.deleteNonRedirectWithWithAnyReferenceTo(theNewResource);
+		//TODO GGG MDM: Check if this is actually handled already in mdm update code or not.
+		if (myGoldenResourceHelper.isDeactivated(theUpdatedResource)) {
+			ourLog.debug("Deleting MDM links to deactivated Person {}", theUpdatedResource.getIdElement().toUnqualifiedVersionless());
+			int deleted = myMdmLinkDeleteSvc.deleteNonRedirectWithWithAnyReferenceTo(theUpdatedResource);
 			if (deleted > 0) {
-				ourLog.debug("Deleted {} empi links", deleted);
+				ourLog.debug("Deleted {} MDM links", deleted);
 			}
 		}
 
 		if (isInternalRequest(theRequestDetails)) {
 			return;
 		}
-		forbidIfEmpiManagedTagIsPresent(theOldResource);
-		forbidModifyingEmpiTag(theNewResource, theOldResource);
+		forbidIfMdmManagedTagIsPresent(theOldResource);
+		forbidModifyingMdmTag(theUpdatedResource, theOldResource);
 
-		if (myEmpiSettings.isPreventEidUpdates()) {
-			forbidIfModifyingExternalEidOnTarget(theNewResource, theOldResource);
+		if (myMdmSettings.isPreventEidUpdates()) {
+			forbidIfModifyingExternalEidOnTarget(theUpdatedResource, theOldResource);
 		}
 	}
 
 	@Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_DELETED)
-	public void deleteEmpiLinks(RequestDetails theRequest, IBaseResource theResource) {
-		if (!EmpiUtil.isEmpiResourceType(myFhirContext, theResource)) {
+	public void deleteMdmLinks(RequestDetails theRequest, IBaseResource theResource) {
+		if (!MdmUtil.isMdmResourceType(myFhirContext, theResource)) {
 			return;
 		}
-		myEmpiLinkDeleteSvc.deleteWithAnyReferenceTo(theResource);
+		myMdmLinkDeleteSvc.deleteWithAnyReferenceTo(theResource);
 	}
 
 	private void forbidIfModifyingExternalEidOnTarget(IBaseResource theNewResource, IBaseResource theOldResource) {
@@ -130,11 +130,11 @@ public class EmpiStorageInterceptor implements IEmpiStorageInterceptor {
 	}
 
 	/*
-	 * Will throw a forbidden error if a request attempts to add/remove the EMPI tag on a Person.
+	 * Will throw a forbidden error if a request attempts to add/remove the MDM tag on a Resource.
 	 */
-	private void forbidModifyingEmpiTag(IBaseResource theNewResource, IBaseResource theOldResource) {
-		if (EmpiUtil.isEmpiManaged(theNewResource) != EmpiUtil.isEmpiManaged(theOldResource)) {
-			throwBlockEmpiManagedTagChange();
+	private void forbidModifyingMdmTag(IBaseResource theNewResource, IBaseResource theOldResource) {
+		if (MdmUtil.isMdmManaged(theNewResource) != MdmUtil.isMdmManaged(theOldResource)) {
+			throwBlockMdmManagedTagChange();
 		}
 	}
 
@@ -154,18 +154,21 @@ public class EmpiStorageInterceptor implements IEmpiStorageInterceptor {
 		return theRequestDetails == null;
 	}
 
-	private void forbidIfEmpiManagedTagIsPresent(IBaseResource theResource) {
-		if (EmpiUtil.isEmpiManaged(theResource)) {
-			throwModificationBlockedByEmpi();
+	private void forbidIfMdmManagedTagIsPresent(IBaseResource theResource) {
+		if (MdmUtil.isMdmManaged(theResource)) {
+			throwModificationBlockedByMdm();
+		}
+		if (MdmUtil.hasGoldenRecordSystemTag(theResource)) {
+			throwModificationBlockedByMdm();
 		}
 	}
 
-	private void throwBlockEmpiManagedTagChange() {
-		throw new ForbiddenOperationException("The " + EmpiConstants.CODE_HAPI_MDM_MANAGED + " tag on a resource may not be changed once created.");
+	private void throwBlockMdmManagedTagChange() {
+		throw new ForbiddenOperationException("The " + MdmConstants.CODE_HAPI_MDM_MANAGED + " tag on a resource may not be changed once created.");
 	}
 
-	private void throwModificationBlockedByEmpi() {
-		throw new ForbiddenOperationException("Cannot create or modify Resources that are managed by EMPI.");
+	private void throwModificationBlockedByMdm() {
+		throw new ForbiddenOperationException("Cannot create or modify Resources that are managed by MDM. This resource contains a tag with one of these systems: " + MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS + " or " + MdmConstants.SYSTEM_MDM_MANAGED);
 	}
 
 	private void throwBlockMultipleEids() {
@@ -177,14 +180,14 @@ public class EmpiStorageInterceptor implements IEmpiStorageInterceptor {
 	}
 
 	@Hook(Pointcut.STORAGE_PRESTORAGE_EXPUNGE_EVERYTHING)
-	public void expungeAllEmpiLinks(AtomicInteger theCounter) {
-		ourLog.debug("Expunging all EmpiLink records");
-		theCounter.addAndGet(myExpungeEverythingService.expungeEverythingByType(EmpiLink.class));
+	public void expungeAllMdmLinks(AtomicInteger theCounter) {
+		ourLog.debug("Expunging all MdmLink records");
+		theCounter.addAndGet(myExpungeEverythingService.expungeEverythingByType(MdmLink.class));
 	}
 
 	@Hook(Pointcut.STORAGE_PRESTORAGE_EXPUNGE_RESOURCE)
-	public void expungeAllMatchedEmpiLinks(AtomicInteger theCounter, IBaseResource theResource) {
-		ourLog.debug("Expunging EmpiLink records with reference to {}", theResource.getIdElement());
-		theCounter.addAndGet(myEmpiLinkDeleteSvc.deleteWithAnyReferenceTo(theResource));
+	public void expungeAllMatchedMdmLinks(AtomicInteger theCounter, IBaseResource theResource) {
+		ourLog.debug("Expunging MdmLink records with reference to {}", theResource.getIdElement());
+		theCounter.addAndGet(myMdmLinkDeleteSvc.deleteWithAnyReferenceTo(theResource));
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiSubmitterInterceptorLoader.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java
similarity index 76%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiSubmitterInterceptorLoader.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java
index db847aa5104..952d7810b6d 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiSubmitterInterceptorLoader.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.interceptor;
+package ca.uhn.fhir.jpa.mdm.interceptor;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.empi.interceptor;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.jpa.api.config.DaoConfig;
 import ca.uhn.fhir.jpa.subscription.submit.interceptor.SubscriptionSubmitInterceptorLoader;
@@ -31,15 +31,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;
 
-public class EmpiSubmitterInterceptorLoader {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmSubmitterInterceptorLoader {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private IEmpiSettings myEmpiProperties;
+	private IMdmSettings myMdmSettings;
 	@Autowired
 	DaoConfig myDaoConfig;
 	@Autowired
-	private IEmpiStorageInterceptor myIEmpiStorageInterceptor;
+	private IMdmStorageInterceptor myIMdmStorageInterceptor;
 	@Autowired
 	private IInterceptorService myInterceptorService;
 	@Autowired
@@ -47,13 +47,13 @@ public class EmpiSubmitterInterceptorLoader {
 
 	@PostConstruct
 	public void start() {
-		if (!myEmpiProperties.isEnabled()) {
+		if (!myMdmSettings.isEnabled()) {
 			return;
 		}
 
 		myDaoConfig.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.MESSAGE);
-		myInterceptorService.registerInterceptor(myIEmpiStorageInterceptor);
-		ourLog.info("EMPI interceptor registered");
+		myInterceptorService.registerInterceptor(myIMdmStorageInterceptor);
+		ourLog.info("MDM interceptor registered");
 		// We need to call SubscriptionSubmitInterceptorLoader.start() again in case there were no subscription types the first time it was called.
 		mySubscriptionSubmitInterceptorLoader.start();
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/GoldenResourceMergerSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java
similarity index 70%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/GoldenResourceMergerSvcImpl.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java
index 240323a0a63..4320276f97d 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/GoldenResourceMergerSvcImpl.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,16 +20,16 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.api.IGoldenResourceMergerSvc;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.util.PersonHelper;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.api.IGoldenResourceMergerSvc;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
@@ -43,18 +43,18 @@ import java.util.Optional;
 
 @Service
 public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	PersonHelper myPersonHelper;
+	GoldenResourceHelper myGoldenResourceHelper;
 	@Autowired
-	EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	MdmLinkDaoSvc myMdmLinkDaoSvc;
 	@Autowired
-	IEmpiLinkSvc myEmpiLinkSvc;
+	IMdmLinkSvc myEmpiLinkSvc;
 	@Autowired
 	IdHelperService myIdHelperService;
 	@Autowired
-	EmpiResourceDaoSvc myEmpiResourceDaoSvc;
+	MdmResourceDaoSvc myMdmResourceDaoSvc;
 
 	@Override
 	@Transactional
@@ -64,7 +64,7 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
 		String resourceType = theMdmTransactionContext.getResourceType();
 
 		//Merge attributes, to be determined when survivorship is solved.
-		myPersonHelper.mergeFields(theFromGoldenResource, theToGoldenResource);
+		myGoldenResourceHelper.mergeFields(theFromGoldenResource, theToGoldenResource);
 
 		//Merge the links from the FROM to the TO resource. Clean up dangling links.
 		mergeGoldenResourceLinks(theFromGoldenResource, theToGoldenResource, toGoldenResourcePid, theMdmTransactionContext);
@@ -73,13 +73,13 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
 		addMergeLink(toGoldenResourcePid, fromGoldenResourcePid, resourceType);
 
 		//Strip the golden resource tag from the now-deprecated resource.
-		myEmpiResourceDaoSvc.removeGoldenResourceTag(theFromGoldenResource, resourceType);
+		myMdmResourceDaoSvc.removeGoldenResourceTag(theFromGoldenResource, resourceType);
 
 		//Add the REDIRECT tag to that same deprecated resource.
-		myPersonHelper.deactivateResource(theFromGoldenResource);
+		myGoldenResourceHelper.deactivateResource(theFromGoldenResource);
 
 		//Save the deprecated resource.
-		myEmpiResourceDaoSvc.upsertSourceResource(theFromGoldenResource, resourceType);
+		myMdmResourceDaoSvc.upsertSourceResource(theFromGoldenResource, resourceType);
 
 		log(theMdmTransactionContext, "Merged " + theFromGoldenResource.getIdElement().toVersionless() + " into " + theToGoldenResource.getIdElement().toVersionless());
 		return theToGoldenResource;
@@ -93,26 +93,26 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
 	 * @param theMdmTransactionContext Context to keep track of the deletions
 	 */
 	private void removeTargetLinks(IAnyResource theFrom, IAnyResource theTo, MdmTransactionContext theMdmTransactionContext) {
-		List<EmpiLink> allLinksWithTheFromAsTarget = myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(theFrom);
+		List<MdmLink> allLinksWithTheFromAsTarget = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theFrom);
 		allLinksWithTheFromAsTarget
 			.stream()
 			//TODO GGG NG MDM: Why are we keeping manual links? Haven't we already copied those over in the previous merge step?
-			.filter(EmpiLink::isAuto) // only keep manual links
+			.filter(MdmLink::isAuto) // only keep manual links
 			.forEach(l -> {
 				theMdmTransactionContext.addTransactionLogMessage(String.format("Deleting link %s", l));
-				myEmpiLinkDaoSvc.deleteLink(l);
+				myMdmLinkDaoSvc.deleteLink(l);
 			});
 	}
 
 	private void addMergeLink(Long theSourceResourcePidAkaActive, Long theTargetResourcePidAkaDeactivated, String theResourceType) {
-		EmpiLink empiLink = myEmpiLinkDaoSvc
-			.getOrCreateEmpiLinkBySourceResourcePidAndTargetResourcePid(theSourceResourcePidAkaActive, theTargetResourcePidAkaDeactivated);
+		MdmLink mdmLink = myMdmLinkDaoSvc
+			.getOrCreateMdmLinkBySourceResourcePidAndTargetResourcePid(theSourceResourcePidAkaActive, theTargetResourcePidAkaDeactivated);
 
-		empiLink
-			.setEmpiTargetType(theResourceType)
-			.setMatchResult(EmpiMatchResultEnum.REDIRECT)
-			.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		myEmpiLinkDaoSvc.save(empiLink);
+		mdmLink
+			.setMdmTargetType(theResourceType)
+			.setMatchResult(MdmMatchResultEnum.REDIRECT)
+			.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		myMdmLinkDaoSvc.save(mdmLink);
 	}
 
 
@@ -131,22 +131,22 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
 	 * @param theMdmTransactionContext
 	 */
 	private void mergeGoldenResourceLinks(IAnyResource theFromResource, IAnyResource theToResource, Long theToResourcePid, MdmTransactionContext theMdmTransactionContext) {
-		List<EmpiLink> fromLinks = myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(theFromResource); // fromLinks - links going to theFromResource
-		List<EmpiLink> toLinks = myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(theToResource); // toLinks - links going to theToResource
-		List<EmpiLink> toDelete = new ArrayList<>();
+		List<MdmLink> fromLinks = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theFromResource); // fromLinks - links going to theFromResource
+		List<MdmLink> toLinks = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theToResource); // toLinks - links going to theToResource
+		List<MdmLink> toDelete = new ArrayList<>();
 
-		for (EmpiLink fromLink : fromLinks) {
-			Optional<EmpiLink> optionalToLink = findFirstLinkWithMatchingTarget(toLinks, fromLink);
+		for (MdmLink fromLink : fromLinks) {
+			Optional<MdmLink> optionalToLink = findFirstLinkWithMatchingTarget(toLinks, fromLink);
 			if (optionalToLink.isPresent()) {
 
 				// The original links already contain this target, so move it over to the toResource
-				EmpiLink toLink = optionalToLink.get();
+				MdmLink toLink = optionalToLink.get();
 				if (fromLink.isManual()) {
 					switch (toLink.getLinkSource()) {
 						case AUTO:
 							//3
 							log(theMdmTransactionContext, String.format("MANUAL overrides AUT0.  Deleting link %s", toLink.toString()));
-							myEmpiLinkDaoSvc.deleteLink(toLink);
+							myMdmLinkDaoSvc.deleteLink(toLink);
 							break;
 						case MANUAL:
 							if (fromLink.getMatchResult() != toLink.getMatchResult()) {
@@ -162,14 +162,14 @@ public class GoldenResourceMergerSvcImpl implements IGoldenResourceMergerSvc {
 			//2 The original TO links didn't contain this target, so move it over to the toGoldenResource
 			fromLink.setGoldenResourcePid(theToResourcePid);
 			ourLog.trace("Saving link {}", fromLink);
-			myEmpiLinkDaoSvc.save(fromLink);
+			myMdmLinkDaoSvc.save(fromLink);
 		}
 		//1 Delete dangling links
-		toDelete.forEach(link -> myEmpiLinkDaoSvc.deleteLink(link));
+		toDelete.forEach(link -> myMdmLinkDaoSvc.deleteLink(link));
 	}
 
-	private Optional<EmpiLink> findFirstLinkWithMatchingTarget(List<EmpiLink> theEmpiLinks, EmpiLink theLinkWithTargetToMatch) {
-		return theEmpiLinks.stream()
+	private Optional<MdmLink> findFirstLinkWithMatchingTarget(List<MdmLink> theMdmLinks, MdmLink theLinkWithTargetToMatch) {
+		return theMdmLinks.stream()
 			.filter(empiLink -> empiLink.getTargetPid().equals(theLinkWithTargetToMatch.getTargetPid()))
 			.findFirst();
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiChannelSubmitterSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java
similarity index 67%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiChannelSubmitterSvcImpl.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java
index e841398e1bd..4d0233cacde 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiChannelSubmitterSvcImpl.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -21,8 +21,8 @@ package ca.uhn.fhir.jpa.empi.svc;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiChannelSubmitterSvc;
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.api.IMdmChannelSubmitterSvc;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.jpa.subscription.channel.api.ChannelProducerSettings;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
 import ca.uhn.fhir.jpa.subscription.model.ResourceModifiedJsonMessage;
@@ -33,47 +33,47 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.MessageChannel;
 
-import static ca.uhn.fhir.empi.api.IEmpiSettings.EMPI_CHANNEL_NAME;
+import static ca.uhn.fhir.mdm.api.IMdmSettings.MDM_CHANNEL_NAME;
 
 /**
- * This class is responsible for manual submissions of {@link IAnyResource} resources onto the Empi Channel.
+ * This class is responsible for manual submissions of {@link IAnyResource} resources onto the MDM Channel.
  */
-public class EmpiChannelSubmitterSvcImpl implements IEmpiChannelSubmitterSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmChannelSubmitterSvcImpl implements IMdmChannelSubmitterSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
-	private MessageChannel myEmpiChannelProducer;
+	private MessageChannel myMdmChannelProducer;
 
 	private FhirContext myFhirContext;
 
 	private IChannelFactory myChannelFactory;
 
 	@Override
-	public void submitResourceToEmpiChannel(IBaseResource theResource) {
+	public void submitResourceToMdmChannel(IBaseResource theResource) {
 		ResourceModifiedJsonMessage resourceModifiedJsonMessage = new ResourceModifiedJsonMessage();
 		ResourceModifiedMessage resourceModifiedMessage = new ResourceModifiedMessage(myFhirContext, theResource, ResourceModifiedMessage.OperationTypeEnum.MANUALLY_TRIGGERED);
 		resourceModifiedMessage.setOperationType(ResourceModifiedMessage.OperationTypeEnum.MANUALLY_TRIGGERED);
 		resourceModifiedJsonMessage.setPayload(resourceModifiedMessage);
-		boolean success = getEmpiChannelProducer().send(resourceModifiedJsonMessage);
+		boolean success = getMdmChannelProducer().send(resourceModifiedJsonMessage);
 		if (!success) {
-			ourLog.error("Failed to submit {} to EMPI Channel.", resourceModifiedMessage.getPayloadId());
+			ourLog.error("Failed to submit {} to MDM Channel.", resourceModifiedMessage.getPayloadId());
 		}
 	}
 
 	@Autowired
-	public EmpiChannelSubmitterSvcImpl(FhirContext theFhirContext, IChannelFactory theIChannelFactory) {
+	public MdmChannelSubmitterSvcImpl(FhirContext theFhirContext, IChannelFactory theIChannelFactory) {
 		myFhirContext = theFhirContext;
 		myChannelFactory = theIChannelFactory;
 	}
 
 	private void init() {
 		ChannelProducerSettings channelSettings = new ChannelProducerSettings();
-		myEmpiChannelProducer= myChannelFactory.getOrCreateProducer(EMPI_CHANNEL_NAME, ResourceModifiedJsonMessage.class, channelSettings);
+		myMdmChannelProducer = myChannelFactory.getOrCreateProducer(MDM_CHANNEL_NAME, ResourceModifiedJsonMessage.class, channelSettings);
 	}
 
-	private MessageChannel getEmpiChannelProducer() {
-		if (myEmpiChannelProducer == null) {
+	private MessageChannel getMdmChannelProducer() {
+		if (myMdmChannelProducer == null) {
 			init();
 		}
-		return myEmpiChannelProducer;
+		return myMdmChannelProducer;
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java
new file mode 100644
index 00000000000..690996b7747
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java
@@ -0,0 +1,79 @@
+package ca.uhn.fhir.jpa.mdm.svc;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.mdm.api.IMdmExpungeSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.jpa.api.model.DeleteMethodOutcome;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.rest.server.provider.ProviderConstants;
+import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * This class is responsible for clearing out existing MDM links, as well as deleting all persons related to those MDM Links.
+ *
+ */
+public class MdmClearSvcImpl implements IMdmExpungeSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
+
+	final MdmLinkDaoSvc myMdmLinkDaoSvc;
+	final MdmGoldenResourceDeletingSvc myMdmGoldenResourceDeletingSvcImpl;
+	final IMdmSettings myMdmSettings;
+
+	@Autowired
+	public MdmClearSvcImpl(MdmLinkDaoSvc theMdmLinkDaoSvc, MdmGoldenResourceDeletingSvc theMdmGoldenResourceDeletingSvcImpl, IMdmSettings theIMdmSettings) {
+		myMdmLinkDaoSvc = theMdmLinkDaoSvc;
+		myMdmGoldenResourceDeletingSvcImpl = theMdmGoldenResourceDeletingSvcImpl;
+		myMdmSettings = theIMdmSettings;
+	}
+
+	@Override
+	public long expungeAllMdmLinksOfTargetType(String theResourceType, ServletRequestDetails theRequestDetails) {
+		throwExceptionIfInvalidTargetType(theResourceType);
+		ourLog.info("Clearing all MDM Links for resource type {}...", theResourceType);
+		List<Long> personPids = myMdmLinkDaoSvc.deleteAllMdmLinksOfTypeAndReturnGoldenResourcePids(theResourceType);
+		DeleteMethodOutcome deleteOutcome = myMdmGoldenResourceDeletingSvcImpl.expungeGoldenResourcePids(personPids, theRequestDetails);
+		ourLog.info("MDM clear operation complete.  Removed {} MDM links and {} Person resources.", personPids.size(), deleteOutcome.getExpungedResourcesCount());
+		return personPids.size();
+	}
+
+	private void throwExceptionIfInvalidTargetType(String theResourceType) {
+		if (!myMdmSettings.isSupportedMdmType(theResourceType)) {
+			throw new InvalidRequestException(ProviderConstants.MDM_CLEAR + " does not support resource type: " + theResourceType);
+		}
+	}
+
+	@Override
+	public long expungeAllMdmLinks(ServletRequestDetails theRequestDetails) {
+		ourLog.info("Clearing all MDM Links...");
+		List<Long> goldenResourcePids = myMdmLinkDaoSvc.deleteAllMdmLinksAndReturnGoldenResourcePids();
+		DeleteMethodOutcome deleteOutcome = myMdmGoldenResourceDeletingSvcImpl.expungeGoldenResourcePids(goldenResourcePids, theRequestDetails);
+		ourLog.info("MDM clear operation complete.  Removed {} MDM links and expunged {} Golden resources.", goldenResourcePids.size(), deleteOutcome.getExpungedResourcesCount());
+		return goldenResourcePids.size();
+	}
+}
+
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java
new file mode 100644
index 00000000000..8c1e50cdb0c
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java
@@ -0,0 +1,100 @@
+package ca.uhn.fhir.jpa.mdm.svc;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.mdm.api.MdmLinkJson;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkQuerySvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkUpdaterSvc;
+import ca.uhn.fhir.mdm.api.IGoldenResourceMergerSvc;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.provider.MdmControllerHelper;
+import ca.uhn.fhir.mdm.provider.MdmControllerUtil;
+import ca.uhn.fhir.rest.server.provider.ProviderConstants;
+import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.stream.Stream;
+
+/**
+ * This class acts as a layer between MdmProviders and MDM services to support a REST API that's not a FHIR Operation API.
+ */
+@Service
+public class MdmControllerSvcImpl implements IMdmControllerSvc {
+	@Autowired
+	MdmControllerHelper myMdmControllerHelper;
+	@Autowired
+	IGoldenResourceMergerSvc myGoldenResourceMergerSvc;
+	@Autowired
+	IMdmLinkQuerySvc myMdmLinkQuerySvc;
+	@Autowired
+	IMdmLinkUpdaterSvc myIMdmLinkUpdaterSvc;
+
+	@Override
+	public IAnyResource mergeGoldenResources(String theFromPersonId, String theToPersonId, MdmTransactionContext theMdmTransactionContext) {
+		IAnyResource fromPerson = myMdmControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_MERGE_GR_FROM_GOLDEN_RESOURCE_ID, theFromPersonId);
+		IAnyResource toPerson = myMdmControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_MERGE_GR_TO_GOLDEN_RESOURCE_ID, theToPersonId);
+		myMdmControllerHelper.validateMergeResources(fromPerson, toPerson);
+		myMdmControllerHelper.validateSameVersion(fromPerson, theFromPersonId);
+		myMdmControllerHelper.validateSameVersion(toPerson, theToPersonId);
+
+		return myGoldenResourceMergerSvc.mergeGoldenResources(fromPerson, toPerson, theMdmTransactionContext);
+	}
+
+	@Override
+	public Stream<MdmLinkJson> queryLinks(@Nullable String thePersonId, @Nullable String theTargetId, @Nullable String theMatchResult, @Nullable String theLinkSource, MdmTransactionContext theMdmTransactionContext) {
+		IIdType personId = MdmControllerUtil.extractPersonIdDtOrNull(ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, thePersonId);
+		IIdType targetId = MdmControllerUtil.extractTargetIdDtOrNull(ProviderConstants.MDM_QUERY_LINKS_RESOURCE_ID, theTargetId);
+		MdmMatchResultEnum matchResult = MdmControllerUtil.extractMatchResultOrNull(theMatchResult);
+		MdmLinkSourceEnum linkSource = MdmControllerUtil.extractLinkSourceOrNull(theLinkSource);
+
+		return myMdmLinkQuerySvc.queryLinks(personId, targetId, matchResult, linkSource, theMdmTransactionContext);
+	}
+
+	@Override
+	public Stream<MdmLinkJson> getDuplicateGoldenResources(MdmTransactionContext theMdmTransactionContext) {
+		return myMdmLinkQuerySvc.getDuplicatePersons(theMdmTransactionContext);
+	}
+
+	@Override
+	public IAnyResource updateLink(String theGoldenResourceId, String theTargetId, String theMatchResult, MdmTransactionContext theMdmTransactionContext) {
+		MdmMatchResultEnum matchResult = MdmControllerUtil.extractMatchResultOrNull(theMatchResult);
+		IAnyResource person = myMdmControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, theGoldenResourceId);
+		IAnyResource target = myMdmControllerHelper.getLatestTargetFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_RESOURCE_ID, theTargetId);
+		myMdmControllerHelper.validateSameVersion(person, theGoldenResourceId);
+		myMdmControllerHelper.validateSameVersion(target, theTargetId);
+
+		return myIMdmLinkUpdaterSvc.updateLink(person, target, matchResult, theMdmTransactionContext);
+	}
+
+	@Override
+	public void notDuplicateGoldenResource(String thePersonId, String theTargetPersonId, MdmTransactionContext theMdmTransactionContext) {
+		IAnyResource person = myMdmControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, thePersonId);
+		IAnyResource target = myMdmControllerHelper.getLatestGoldenResourceFromIdOrThrowException(ProviderConstants.MDM_UPDATE_LINK_RESOURCE_ID, theTargetPersonId);
+
+		myIMdmLinkUpdaterSvc.notDuplicatePerson(person, target, theMdmTransactionContext);
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiEidUpdateService.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java
similarity index 59%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiEidUpdateService.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java
index 7c3bcb2d432..8293a1e6b36 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiEidUpdateService.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,19 +20,19 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.empi.util.PersonHelper;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiSourceResourceFindingSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.MatchedSourceResourceCandidate;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmGoldenResourceFindingSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MatchedSourceResourceCandidate;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
@@ -43,33 +43,33 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-public class EmpiEidUpdateService {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmEidUpdateService {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private EmpiResourceDaoSvc myEmpiResourceDaoSvc;
+	private MdmResourceDaoSvc myMdmResourceDaoSvc;
 	@Autowired
-	private IEmpiLinkSvc myEmpiLinkSvc;
+	private IMdmLinkSvc myMdmLinkSvc;
 	@Autowired
-	private EmpiSourceResourceFindingSvc myEmpiSourceResourceFindingSvc;
+	private MdmGoldenResourceFindingSvc myMdmGoldenResourceFindingSvc;
 	@Autowired
-	private PersonHelper myPersonHelper;
+	private GoldenResourceHelper myGoldenResourceHelper;
 	@Autowired
 	private EIDHelper myEIDHelper;
 	@Autowired
-	private EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	private MdmLinkDaoSvc myMdmLinkDaoSvc;
 	@Autowired
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myMdmSettings;
 
-	void handleEmpiUpdate(IAnyResource theResource, MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, MdmTransactionContext theMdmTransactionContext) {
-		EmpiUpdateContext updateContext = new EmpiUpdateContext(theMatchedSourceResourceCandidate, theResource);
+	void handleMdmUpdate(IAnyResource theResource, MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, MdmTransactionContext theMdmTransactionContext) {
+		MdmUpdateContext updateContext = new MdmUpdateContext(theMatchedSourceResourceCandidate, theResource);
 		if (updateContext.isRemainsMatchedToSamePerson()) {
 			// Copy over any new external EIDs which don't already exist.
 			// TODO NG - Eventually this call will use terser to clone data in, once the surviorship rules for copying data will be confirmed
 			// myPersonHelper.updatePersonFromUpdatedEmpiTarget(updateContext.getMatchedPerson(), theResource, theEmpiTransactionContext);
 			if (!updateContext.isIncomingResourceHasAnEid() || updateContext.isHasEidsInCommon()) {
 				//update to patient that uses internal EIDs only.
-				myEmpiLinkSvc.updateLink(updateContext.getMatchedSourceResource(), theResource, theMatchedSourceResourceCandidate.getMatchResult(), EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
+				myMdmLinkSvc.updateLink(updateContext.getMatchedSourceResource(), theResource, theMatchedSourceResourceCandidate.getMatchResult(), MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
 			} else if (!updateContext.isHasEidsInCommon()) {
 				handleNoEidsInCommon(theResource, theMatchedSourceResourceCandidate, theMdmTransactionContext, updateContext);
 			}
@@ -80,47 +80,47 @@ public class EmpiEidUpdateService {
 		}
 	}
 
-	private void handleNoEidsInCommon(IAnyResource theResource, MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, MdmTransactionContext theMdmTransactionContext, EmpiUpdateContext theUpdateContext) {
+	private void handleNoEidsInCommon(IAnyResource theResource, MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, MdmTransactionContext theMdmTransactionContext, MdmUpdateContext theUpdateContext) {
 		// the user is simply updating their EID. We propagate this change to the Person.
 		//overwrite. No EIDS in common, but still same person.
-		if (myEmpiSettings.isPreventMultipleEids()) {
-			if (myEmpiLinkDaoSvc.findEmpiMatchLinksBySource(theUpdateContext.getMatchedSourceResource()).size() <= 1) { // If there is only 0/1 link on the person, we can safely overwrite the EID.
+		if (myMdmSettings.isPreventMultipleEids()) {
+			if (myMdmLinkDaoSvc.findMdmMatchLinksBySource(theUpdateContext.getMatchedSourceResource()).size() <= 1) { // If there is only 0/1 link on the person, we can safely overwrite the EID.
 			// if (myPersonHelper.getLinkCount(theUpdateContext.getMatchedSourceResource()) <= 1) { // If there is only 0/1 link on the person, we can safely overwrite the EID.
 				handleExternalEidOverwrite(theUpdateContext.getMatchedSourceResource(), theResource, theMdmTransactionContext);
 			} else { // If the person has multiple patients tied to it, we can't just overwrite the EID, so we split the person.
 				createNewPersonAndFlagAsDuplicate(theResource, theMdmTransactionContext, theUpdateContext.getExistingPerson());
 			}
 		} else {
-			myPersonHelper.handleExternalEidAddition(theUpdateContext.getMatchedSourceResource(), theResource, theMdmTransactionContext);
+			myGoldenResourceHelper.handleExternalEidAddition(theUpdateContext.getMatchedSourceResource(), theResource, theMdmTransactionContext);
 		}
-		myEmpiLinkSvc.updateLink(theUpdateContext.getMatchedSourceResource(), theResource, theMatchedSourceResourceCandidate.getMatchResult(), EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
+		myMdmLinkSvc.updateLink(theUpdateContext.getMatchedSourceResource(), theResource, theMatchedSourceResourceCandidate.getMatchResult(), MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
 	}
 
 	private void handleExternalEidOverwrite(IAnyResource thePerson, IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
 		List<CanonicalEID> eidFromResource = myEIDHelper.getExternalEid(theResource);
 		if (!eidFromResource.isEmpty()) {
-			myPersonHelper.overwriteExternalEids(thePerson, eidFromResource);
+			myGoldenResourceHelper.overwriteExternalEids(thePerson, eidFromResource);
 		}
 	}
 
-	private boolean candidateIsSameAsEmpiLinkPerson(EmpiLink theExistingMatchLink, MatchedSourceResourceCandidate thePersonCandidate) {
-		return theExistingMatchLink.getSourceResourcePid().equals(thePersonCandidate.getCandidatePersonPid().getIdAsLong());
+	private boolean candidateIsSameAsMdmLinkPerson(MdmLink theExistingMatchLink, MatchedSourceResourceCandidate thePersonCandidate) {
+		return theExistingMatchLink.getGoldenResourcePid().equals(thePersonCandidate.getCandidatePersonPid().getIdAsLong());
 	}
 
 	private void createNewPersonAndFlagAsDuplicate(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext, IAnyResource theOldPerson) {
 		log(theMdmTransactionContext, "Duplicate detected based on the fact that both resources have different external EIDs.");
-		IAnyResource newPerson = myPersonHelper.createGoldenResourceFromMdmTarget(theResource);
+		IAnyResource newPerson = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(theResource);
 
-		myEmpiLinkSvc.updateLink(newPerson, theResource, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
-		myEmpiLinkSvc.updateLink(newPerson, theOldPerson, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
+		myMdmLinkSvc.updateLink(newPerson, theResource, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+		myMdmLinkSvc.updateLink(newPerson, theOldPerson, MdmMatchOutcome.POSSIBLE_DUPLICATE, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
 	}
 
 	private void linkToNewPersonAndFlagAsDuplicate(IAnyResource theResource, IAnyResource theOldPerson, IAnyResource theNewPerson, MdmTransactionContext theMdmTransactionContext) {
 		log(theMdmTransactionContext, "Changing a match link!");
-		myEmpiLinkSvc.deleteLink(theOldPerson, theResource, theMdmTransactionContext);
-		myEmpiLinkSvc.updateLink(theNewPerson, theResource, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
+		myMdmLinkSvc.deleteLink(theOldPerson, theResource, theMdmTransactionContext);
+		myMdmLinkSvc.updateLink(theNewPerson, theResource, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
 		log(theMdmTransactionContext, "Duplicate detected based on the fact that both resources have different external EIDs.");
-		myEmpiLinkSvc.updateLink(theNewPerson, theOldPerson, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, theMdmTransactionContext);
+		myMdmLinkSvc.updateLink(theNewPerson, theOldPerson, MdmMatchOutcome.POSSIBLE_DUPLICATE, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
 	}
 
 	private void log(MdmTransactionContext theMdmTransactionContext, String theMessage) {
@@ -131,7 +131,7 @@ public class EmpiEidUpdateService {
 	/**
 	 * Data class to hold context surrounding an update operation for an EMPI target.
 	 */
-	class EmpiUpdateContext {
+	class MdmUpdateContext {
 		private final boolean myHasEidsInCommon;
 		private final boolean myIncomingResourceHasAnEid;
 		private IAnyResource myExistingPerson;
@@ -143,21 +143,21 @@ public class EmpiEidUpdateService {
 
 		private final IAnyResource myMatchedSourceResource;
 
-		EmpiUpdateContext(MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, IAnyResource theResource) {
+		MdmUpdateContext(MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, IAnyResource theResource) {
 			final String resourceType = theResource.getIdElement().getResourceType();
-			myMatchedSourceResource = myEmpiSourceResourceFindingSvc.getSourceResourceFromMatchedSourceResourceCandidate(theMatchedSourceResourceCandidate, resourceType);
+			myMatchedSourceResource = myMdmGoldenResourceFindingSvc.getSourceResourceFromMatchedSourceResourceCandidate(theMatchedSourceResourceCandidate, resourceType);
 
 			myHasEidsInCommon = myEIDHelper.hasEidOverlap(myMatchedSourceResource, theResource);
 			myIncomingResourceHasAnEid = !myEIDHelper.getExternalEid(theResource).isEmpty();
 
-			Optional<EmpiLink> theExistingMatchLink = myEmpiLinkDaoSvc.getMatchedLinkForTarget(theResource);
+			Optional<MdmLink> theExistingMatchLink = myMdmLinkDaoSvc.getMatchedLinkForTarget(theResource);
 			myExistingPerson = null;
 
 			if (theExistingMatchLink.isPresent()) {
-				EmpiLink empiLink = theExistingMatchLink.get();
-				Long existingPersonPid = empiLink.getSourceResourcePid();
-				myExistingPerson =  myEmpiResourceDaoSvc.readSourceResourceByPid(new ResourcePersistentId(existingPersonPid), resourceType);
-				myRemainsMatchedToSamePerson = candidateIsSameAsEmpiLinkPerson(empiLink, theMatchedSourceResourceCandidate);
+				MdmLink mdmLink = theExistingMatchLink.get();
+				Long existingPersonPid = mdmLink.getGoldenResourcePid();
+				myExistingPerson =  myMdmResourceDaoSvc.readSourceResourceByPid(new ResourcePersistentId(existingPersonPid), resourceType);
+				myRemainsMatchedToSamePerson = candidateIsSameAsMdmLinkPerson(mdmLink, theMatchedSourceResourceCandidate);
 			} else {
 				myRemainsMatchedToSamePerson = false;
 			}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonDeletingSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java
similarity index 85%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonDeletingSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java
index b0959772852..815571bffb4 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonDeletingSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.model.DeleteMethodOutcome;
 import ca.uhn.fhir.jpa.dao.expunge.DeleteExpungeService;
@@ -35,8 +35,8 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class EmpiPersonDeletingSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmGoldenResourceDeletingSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	/**
 	 * This is here for the case of possible infinite loops. Technically batch conflict deletion should handle this, but this is an escape hatch.
@@ -50,7 +50,7 @@ public class EmpiPersonDeletingSvc {
 	@Autowired
 	DeleteExpungeService myDeleteExpungeService;
 
-	public DeleteMethodOutcome expungePersonPids(List<Long> thePersonPids, ServletRequestDetails theRequestDetails) {
+	public DeleteMethodOutcome expungeGoldenResourcePids(List<Long> thePersonPids, ServletRequestDetails theRequestDetails) {
 		return myDeleteExpungeService.expungeByResourcePids(ProviderConstants.MDM_CLEAR, "Person", new SliceImpl<>(thePersonPids), theRequestDetails);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkQuerySvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java
similarity index 50%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkQuerySvcImpl.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java
index 4ecd763e521..63fa8b3249a 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkQuerySvcImpl.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,14 +20,14 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiLinkJson;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiLinkQuerySvc;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.MdmLinkJson;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmLinkQuerySvc;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,33 +36,33 @@ import org.springframework.data.domain.Example;
 
 import java.util.stream.Stream;
 
-public class EmpiLinkQuerySvcImpl implements IEmpiLinkQuerySvc {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiLinkQuerySvcImpl.class);
+public class MdmLinkQuerySvcImpl implements IMdmLinkQuerySvc {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmLinkQuerySvcImpl.class);
 
 	@Autowired
 	IdHelperService myIdHelperService;
 	@Autowired
-	EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	MdmLinkDaoSvc myMdmLinkDaoSvc;
 
 	@Override
-	public Stream<EmpiLinkJson> queryLinks(IIdType thePersonId, IIdType theTargetId, EmpiMatchResultEnum theMatchResult, EmpiLinkSourceEnum theLinkSource, MdmTransactionContext theEmpiContext) {
-		Example<EmpiLink> exampleLink = exampleLinkFromParameters(thePersonId, theTargetId, theMatchResult, theLinkSource);
-		return myEmpiLinkDaoSvc.findEmpiLinkByExample(exampleLink).stream()
-			.filter(empiLink -> empiLink.getMatchResult() != EmpiMatchResultEnum.POSSIBLE_DUPLICATE)
+	public Stream<MdmLinkJson> queryLinks(IIdType thePersonId, IIdType theTargetId, MdmMatchResultEnum theMatchResult, MdmLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext) {
+		Example<MdmLink> exampleLink = exampleLinkFromParameters(thePersonId, theTargetId, theMatchResult, theLinkSource);
+		return myMdmLinkDaoSvc.findMdmLinkByExample(exampleLink).stream()
+			.filter(mdmLink -> mdmLink.getMatchResult() != MdmMatchResultEnum.POSSIBLE_DUPLICATE)
 			.map(this::toJson);
 	}
 
 	@Override
-	public Stream<EmpiLinkJson> getDuplicatePersons(MdmTransactionContext theEmpiContext) {
-		Example<EmpiLink> exampleLink = exampleLinkFromParameters(null, null, EmpiMatchResultEnum.POSSIBLE_DUPLICATE, null);
-		return myEmpiLinkDaoSvc.findEmpiLinkByExample(exampleLink).stream().map(this::toJson);
+	public Stream<MdmLinkJson> getDuplicatePersons(MdmTransactionContext theMdmContext) {
+		Example<MdmLink> exampleLink = exampleLinkFromParameters(null, null, MdmMatchResultEnum.POSSIBLE_DUPLICATE, null);
+		return myMdmLinkDaoSvc.findMdmLinkByExample(exampleLink).stream().map(this::toJson);
 	}
 
-	private EmpiLinkJson toJson(EmpiLink theLink) {
-		EmpiLinkJson retval = new EmpiLinkJson();
+	private MdmLinkJson toJson(MdmLink theLink) {
+		MdmLinkJson retval = new MdmLinkJson();
 		String targetId = myIdHelperService.resourceIdFromPidOrThrowException(theLink.getTargetPid()).toVersionless().getValue();
 		retval.setTargetId(targetId);
-		String goldenResourceId = myIdHelperService.resourceIdFromPidOrThrowException(theLink.getSourceResourcePid()).toVersionless().getValue();
+		String goldenResourceId = myIdHelperService.resourceIdFromPidOrThrowException(theLink.getGoldenResourcePid()).toVersionless().getValue();
 		retval.setGoldenResourceId(goldenResourceId);
 		retval.setCreated(theLink.getCreated());
 		retval.setEidMatch(theLink.getEidMatch());
@@ -76,20 +76,20 @@ public class EmpiLinkQuerySvcImpl implements IEmpiLinkQuerySvc {
 		return retval;
 	}
 
-	private Example<EmpiLink> exampleLinkFromParameters(IIdType thePersonId, IIdType theTargetId, EmpiMatchResultEnum theMatchResult, EmpiLinkSourceEnum theLinkSource) {
-		EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink();
+	private Example<MdmLink> exampleLinkFromParameters(IIdType thePersonId, IIdType theTargetId, MdmMatchResultEnum theMatchResult, MdmLinkSourceEnum theLinkSource) {
+		MdmLink mdmLink = myMdmLinkDaoSvc.newMdmLink();
 		if (thePersonId != null) {
-			empiLink.setGoldenResourcePid(myIdHelperService.getPidOrThrowException(thePersonId));
+			mdmLink.setGoldenResourcePid(myIdHelperService.getPidOrThrowException(thePersonId));
 		}
 		if (theTargetId != null) {
-			empiLink.setTargetPid(myIdHelperService.getPidOrThrowException(theTargetId));
+			mdmLink.setTargetPid(myIdHelperService.getPidOrThrowException(theTargetId));
 		}
 		if (theMatchResult != null) {
-			empiLink.setMatchResult(theMatchResult);
+			mdmLink.setMatchResult(theMatchResult);
 		}
 		if (theLinkSource != null) {
-			empiLink.setLinkSource(theLinkSource);
+			mdmLink.setLinkSource(theLinkSource);
 		}
-		return Example.of(empiLink);
+		return Example.of(mdmLink);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java
new file mode 100644
index 00000000000..b57060c562b
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java
@@ -0,0 +1,143 @@
+package ca.uhn.fhir.jpa.mdm.svc;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.jpa.dao.index.IdHelperService;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
+import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
+import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Optional;
+
+/**
+ * This class is in charge of managing MdmLinks between Golden Resources and target resources
+ */
+@Service
+public class MdmLinkSvcImpl implements IMdmLinkSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
+
+	@Autowired
+	private MdmResourceDaoSvc myMdmResourceDaoSvc;
+	@Autowired
+	private MdmLinkDaoSvc myMdmLinkDaoSvc;
+	@Autowired
+	private GoldenResourceHelper myGoldenResourceHelper;
+	@Autowired
+	private IdHelperService myIdHelperService;
+
+	@Override
+	@Transactional
+	public void updateLink(IAnyResource thePerson, IAnyResource theTarget, MdmMatchOutcome theMatchOutcome, MdmLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext) {
+		if (theMatchOutcome.isPossibleDuplicate() && personsLinkedAsNoMatch(thePerson, theTarget)) {
+			log(theMdmTransactionContext, thePerson.getIdElement().toUnqualifiedVersionless() +
+				" is linked as NO_MATCH with " +
+				theTarget.getIdElement().toUnqualifiedVersionless() +
+				" not linking as POSSIBLE_DUPLICATE.");
+			return;
+		}
+
+		MdmMatchResultEnum matchResultEnum = theMatchOutcome.getMatchResultEnum();
+		validateRequestIsLegal(thePerson, theTarget, matchResultEnum, theLinkSource);
+
+		myMdmResourceDaoSvc.upsertSourceResource(thePerson, theMdmTransactionContext.getResourceType());
+		createOrUpdateLinkEntity(thePerson, theTarget, theMatchOutcome, theLinkSource, theMdmTransactionContext);
+	}
+
+	private boolean personsLinkedAsNoMatch(IAnyResource thePerson, IAnyResource theTarget) {
+		Long personId = myIdHelperService.getPidOrThrowException(thePerson);
+		Long targetId = myIdHelperService.getPidOrThrowException(theTarget);
+		// TODO perf collapse into one query
+		return myMdmLinkDaoSvc.getMdmLinksByPersonPidTargetPidAndMatchResult(personId, targetId, MdmMatchResultEnum.NO_MATCH).isPresent() ||
+			myMdmLinkDaoSvc.getMdmLinksByPersonPidTargetPidAndMatchResult(targetId, personId, MdmMatchResultEnum.NO_MATCH).isPresent();
+	}
+
+	@Override
+	public void deleteLink(IAnyResource theSourceResource, IAnyResource theTargetResource, MdmTransactionContext theMdmTransactionContext) {
+
+		Optional<MdmLink> optionalMdmLink = getMdmLinkForGoldenResourceTargetPair(theSourceResource, theTargetResource);
+		if (optionalMdmLink.isPresent()) {
+			MdmLink mdmLink = optionalMdmLink.get();
+			log(theMdmTransactionContext, "Deleting MdmLink [" + theSourceResource.getIdElement().toVersionless() + " -> " + theTargetResource.getIdElement().toVersionless() + "] with result: " + mdmLink.getMatchResult());
+			myMdmLinkDaoSvc.deleteLink(mdmLink);
+		}
+	}
+
+	/**
+	 * Helper function which runs various business rules about what types of requests are allowed.
+	 */
+	private void validateRequestIsLegal(IAnyResource theGoldenResource, IAnyResource theResource, MdmMatchResultEnum theMatchResult, MdmLinkSourceEnum theLinkSource) {
+		Optional<MdmLink> oExistingLink = getMdmLinkForGoldenResourceTargetPair(theGoldenResource, theResource);
+		if (oExistingLink.isPresent() && systemIsAttemptingToModifyManualLink(theLinkSource, oExistingLink.get())) {
+			throw new InternalErrorException("MDM system is not allowed to modify links on manually created links");
+		}
+
+		if (systemIsAttemptingToAddNoMatch(theLinkSource, theMatchResult)) {
+			throw new InternalErrorException("MDM system is not allowed to automatically NO_MATCH a resource");
+		}
+	}
+
+	/**
+	 * Helper function which detects when the MDM system is attempting to add a NO_MATCH link, which is not allowed.
+	 */
+	private boolean systemIsAttemptingToAddNoMatch(MdmLinkSourceEnum theLinkSource, MdmMatchResultEnum theMatchResult) {
+		return theLinkSource == MdmLinkSourceEnum.AUTO && theMatchResult == MdmMatchResultEnum.NO_MATCH;
+	}
+
+	/**
+	 * Helper function to let us catch when System MDM rules are attempting to override a manually defined link.
+	 */
+	private boolean systemIsAttemptingToModifyManualLink(MdmLinkSourceEnum theIncomingSource, MdmLink theExistingSource) {
+		return theIncomingSource == MdmLinkSourceEnum.AUTO && theExistingSource.isManual();
+	}
+
+	private Optional<MdmLink> getMdmLinkForGoldenResourceTargetPair(IAnyResource thePerson, IAnyResource theCandidate) {
+		if (thePerson.getIdElement().getIdPart() == null || theCandidate.getIdElement().getIdPart() == null) {
+			return Optional.empty();
+		} else {
+			return myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(
+				myIdHelperService.getPidOrNull(thePerson),
+				myIdHelperService.getPidOrNull(theCandidate)
+			);
+		}
+	}
+
+	private void createOrUpdateLinkEntity(IBaseResource theSourceResource, IBaseResource theTargetResource, MdmMatchOutcome theMatchOutcome, MdmLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext) {
+		myMdmLinkDaoSvc.createOrUpdateLinkEntity(theSourceResource, theTargetResource, theMatchOutcome, theLinkSource, theMdmTransactionContext);
+	}
+
+	private void log(MdmTransactionContext theMdmTransactionContext, String theMessage) {
+		theMdmTransactionContext.addTransactionLogMessage(theMessage);
+		ourLog.debug(theMessage);
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkUpdaterSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java
similarity index 60%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkUpdaterSvcImpl.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java
index 91da2d07769..f86131e1ce0 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkUpdaterSvcImpl.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -21,20 +21,18 @@ package ca.uhn.fhir.jpa.empi.svc;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.api.IEmpiLinkUpdaterSvc;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.empi.util.MessageHelper;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.api.IMdmLinkUpdaterSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.mdm.util.MessageHelper;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.provider.ProviderConstants;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -45,30 +43,30 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Objects;
 import java.util.Optional;
 
-public class EmpiLinkUpdaterSvcImpl implements IEmpiLinkUpdaterSvc {
+public class MdmLinkUpdaterSvcImpl implements IMdmLinkUpdaterSvc {
 
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
 	FhirContext myFhirContext;
 	@Autowired
 	IdHelperService myIdHelperService;
 	@Autowired
-	EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	MdmLinkDaoSvc myMdmLinkDaoSvc;
 	@Autowired
-	IEmpiLinkSvc myEmpiLinkSvc;
+	IMdmLinkSvc myMdmLinkSvc;
 	@Autowired
-	EmpiResourceDaoSvc myEmpiResourceDaoSvc;
+	MdmResourceDaoSvc myMdmResourceDaoSvc;
 	@Autowired
-	EmpiMatchLinkSvc myEmpiMatchLinkSvc;
+	MdmMatchLinkSvc myMdmMatchLinkSvc;
 	@Autowired
-	IEmpiSettings myEmpiSettings;
+	IMdmSettings myMdmSettings;
 	@Autowired
 	MessageHelper myMessageHelper;
 
 	@Transactional
 	@Override
-	public IAnyResource updateLink(IAnyResource theGoldenResource, IAnyResource theTarget, EmpiMatchResultEnum theMatchResult, MdmTransactionContext theEmpiContext) {
+	public IAnyResource updateLink(IAnyResource theGoldenResource, IAnyResource theTarget, MdmMatchResultEnum theMatchResult, MdmTransactionContext theMdmContext) {
 		String targetType = myFhirContext.getResourceType(theTarget);
 
 		validateUpdateLinkRequest(theGoldenResource, theTarget, theMatchResult, targetType);
@@ -76,43 +74,42 @@ public class EmpiLinkUpdaterSvcImpl implements IEmpiLinkUpdaterSvc {
 		Long goldenResourceId = myIdHelperService.getPidOrThrowException(theGoldenResource);
 		Long targetId = myIdHelperService.getPidOrThrowException(theTarget);
 
-		Optional<EmpiLink> oEmpiLink = myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenResourceId, targetId);
-		if (!oEmpiLink.isPresent()) {
+		Optional<MdmLink> optionalMdmLink = myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenResourceId, targetId);
+		if (!optionalMdmLink.isPresent()) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForNoLink(theGoldenResource, theTarget));
 		}
 
-		EmpiLink empiLink = oEmpiLink.get();
-		if (empiLink.getMatchResult() == theMatchResult) {
+		MdmLink mdmLink = optionalMdmLink.get();
+		if (mdmLink.getMatchResult() == theMatchResult) {
 			ourLog.warn("MDM Link for " + theGoldenResource.getIdElement().toVersionless() + ", " + theTarget.getIdElement().toVersionless() + " already has value " + theMatchResult + ".  Nothing to do.");
 			return theGoldenResource;
 		}
 
-		ourLog.info("Manually updating MDM Link for " + theGoldenResource.getIdElement().toVersionless() + ", " + theTarget.getIdElement().toVersionless() + " from " + empiLink.getMatchResult() + " to " + theMatchResult + ".");
-		empiLink.setMatchResult(theMatchResult);
-		empiLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		myEmpiLinkDaoSvc.save(empiLink);
-//		myEmpiLinkSvc.syncEmpiLinksToPersonLinks(theGoldenResource, theEmpiContext);
-		myEmpiResourceDaoSvc.upsertSourceResource(theGoldenResource, theEmpiContext.getResourceType());
-		if (theMatchResult == EmpiMatchResultEnum.NO_MATCH) {
+		ourLog.info("Manually updating MDM Link for " + theGoldenResource.getIdElement().toVersionless() + ", " + theTarget.getIdElement().toVersionless() + " from " + mdmLink.getMatchResult() + " to " + theMatchResult + ".");
+		mdmLink.setMatchResult(theMatchResult);
+		mdmLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		myMdmLinkDaoSvc.save(mdmLink);
+		myMdmResourceDaoSvc.upsertSourceResource(theGoldenResource, theMdmContext.getResourceType());
+		if (theMatchResult == MdmMatchResultEnum.NO_MATCH) {
 			// Need to find a new Person to link this target to
-			myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(theTarget, theEmpiContext);
+			myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(theTarget, theMdmContext);
 		}
 		return theGoldenResource;
 	}
 
-	private void validateUpdateLinkRequest(IAnyResource theGoldenRecord, IAnyResource theTarget, EmpiMatchResultEnum theMatchResult, String theTargetType) {
+	private void validateUpdateLinkRequest(IAnyResource theGoldenRecord, IAnyResource theTarget, MdmMatchResultEnum theMatchResult, String theTargetType) {
 		String goldenRecordType = myFhirContext.getResourceType(theGoldenRecord);
 
-		if (theMatchResult != EmpiMatchResultEnum.NO_MATCH &&
-			theMatchResult != EmpiMatchResultEnum.MATCH) {
+		if (theMatchResult != MdmMatchResultEnum.NO_MATCH &&
+			theMatchResult != MdmMatchResultEnum.MATCH) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForUnsupportedMatchResult());
 		}
 
-		if (!myEmpiSettings.isSupportedMdmType(goldenRecordType)) {
+		if (!myMdmSettings.isSupportedMdmType(goldenRecordType)) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForUnsupportedFirstArgumentTypeInUpdate(goldenRecordType));
 		}
 
-		if (!myEmpiSettings.isSupportedMdmType(theTargetType)) {
+		if (!myMdmSettings.isSupportedMdmType(theTargetType)) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForUnsupportedSecondArgumentTypeInUpdate(theTargetType));
 		}
 
@@ -120,39 +117,39 @@ public class EmpiLinkUpdaterSvcImpl implements IEmpiLinkUpdaterSvc {
 			throw new InvalidRequestException(myMessageHelper.getMessageForArgumentTypeMismatchInUpdate(goldenRecordType, theTargetType));
 		}
 
-		if (!EmpiUtil.isEmpiManaged(theGoldenRecord)) {
+		if (!MdmUtil.isMdmManaged(theGoldenRecord)) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForUnmanagedResource());
 		}
 
-		if (!EmpiUtil.isEmpiAccessible(theTarget)) {
+		if (!MdmUtil.isMdmAllowed(theTarget)) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForUnsupportedTarget());
 		}
 	}
 
 	@Transactional
 	@Override
-	public void notDuplicatePerson(IAnyResource thePerson, IAnyResource theTarget, MdmTransactionContext theEmpiContext) {
+	public void notDuplicatePerson(IAnyResource thePerson, IAnyResource theTarget, MdmTransactionContext theMdmContext) {
 		validateNotDuplicatePersonRequest(thePerson, theTarget);
 
 		Long personId = myIdHelperService.getPidOrThrowException(thePerson);
 		Long targetId = myIdHelperService.getPidOrThrowException(theTarget);
 
-		Optional<EmpiLink> oEmpiLink = myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(personId, targetId);
-		if (!oEmpiLink.isPresent()) {
+		Optional<MdmLink> oMdmLink = myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(personId, targetId);
+		if (!oMdmLink.isPresent()) {
 			throw new InvalidRequestException("No link exists between " + thePerson.getIdElement().toVersionless() + " and " + theTarget.getIdElement().toVersionless());
 		}
 
-		EmpiLink empiLink = oEmpiLink.get();
-		if (!empiLink.isPossibleDuplicate()) {
+		MdmLink mdmLink = oMdmLink.get();
+		if (!mdmLink.isPossibleDuplicate()) {
 			throw new InvalidRequestException(thePerson.getIdElement().toVersionless() + " and " + theTarget.getIdElement().toVersionless() + " are not linked as POSSIBLE_DUPLICATE.");
 		}
-		empiLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
-		empiLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		myEmpiLinkDaoSvc.save(empiLink);
+		mdmLink.setMatchResult(MdmMatchResultEnum.NO_MATCH);
+		mdmLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		myMdmLinkDaoSvc.save(mdmLink);
 	}
 
 	/**
-	 * Ensure that the two resources are of the same type and both are managed by HAPI-EMPI.
+	 * Ensure that the two resources are of the same type and both are managed by HAPI-MDM
 	 */
 	private void validateNotDuplicatePersonRequest(IAnyResource theGoldenResource, IAnyResource theTarget) {
 		String goldenResourceType = myFhirContext.getResourceType(theGoldenResource);
@@ -161,8 +158,8 @@ public class EmpiLinkUpdaterSvcImpl implements IEmpiLinkUpdaterSvc {
 			throw new InvalidRequestException("First argument to " + ProviderConstants.MDM_UPDATE_LINK + " must be the same resource type as the second argument.  Was " + goldenResourceType + "/" + targetType);
 		}
 
-		if (!EmpiUtil.isEmpiManaged(theGoldenResource) || !EmpiUtil.isEmpiManaged(theTarget)) {
-			throw new InvalidRequestException("Only EMPI Managed Golden Resources may be updated via this operation.  The resource provided is not tagged as managed by hapi-empi");
+		if (!MdmUtil.isMdmManaged(theGoldenResource) || !MdmUtil.isMdmManaged(theTarget)) {
+			throw new InvalidRequestException("Only MDM Managed Golden Resources may be updated via this operation.  The resource provided is not tagged as managed by hapi-empi");
 		}
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchFinderSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java
similarity index 64%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchFinderSvcImpl.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java
index f8260b00469..ed8368c2a20 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchFinderSvcImpl.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,10 +20,10 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.MatchedTarget;
-import ca.uhn.fhir.empi.rules.svc.EmpiResourceMatcherSvc;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiCandidateSearchSvc;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.MatchedTarget;
+import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,20 +34,20 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-public class EmpiMatchFinderSvcImpl implements IEmpiMatchFinderSvc {
+public class MdmMatchFinderSvcImpl implements IMdmMatchFinderSvc {
 
 	@Autowired
-	private EmpiCandidateSearchSvc myEmpiCandidateSearchSvc;
+	private MdmCandidateSearchSvc myMdmCandidateSearchSvc;
 	@Autowired
-	private EmpiResourceMatcherSvc myEmpiResourceMatcherSvc;
+	private MdmResourceMatcherSvc myMdmResourceMatcherSvc;
 
 	@Override
 	@Nonnull
 	public List<MatchedTarget> getMatchedTargets(String theResourceType, IAnyResource theResource) {
-		Collection<IAnyResource> targetCandidates = myEmpiCandidateSearchSvc.findCandidates(theResourceType, theResource);
+		Collection<IAnyResource> targetCandidates = myMdmCandidateSearchSvc.findCandidates(theResourceType, theResource);
 
 		return targetCandidates.stream()
-			.map(candidate -> new MatchedTarget(candidate, myEmpiResourceMatcherSvc.getMatchResult(theResource, candidate)))
+			.map(candidate -> new MatchedTarget(candidate, myMdmResourceMatcherSvc.getMatchResult(theResource, candidate)))
 			.collect(Collectors.toList());
 	}
 
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java
new file mode 100644
index 00000000000..cf5ee116855
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java
@@ -0,0 +1,165 @@
+package ca.uhn.fhir.jpa.mdm.svc;
+
+/*-
+ * #%L
+ * HAPI FHIR JPA Server - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.CandidateList;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmGoldenResourceFindingSvc;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MatchedSourceResourceCandidate;
+import ca.uhn.fhir.rest.server.TransactionLogMessages;
+import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MdmMatchLinkSvc is the entrypoint for HAPI's MDM system. An incoming resource can call
+ * updateMdmLinksForMdmTarget and the underlying MDM system will take care of matching it to a person, or creating a
+ * new Person if a suitable one was not found.
+ */
+@Service
+public class MdmMatchLinkSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
+
+	@Autowired
+	private IMdmLinkSvc myMdmLinkSvc;
+	@Autowired
+	private MdmGoldenResourceFindingSvc myMdmGoldenResourceFindingSvc;
+	@Autowired
+	private GoldenResourceHelper myGoldenResourceHelper;
+	@Autowired
+	private MdmEidUpdateService myEidUpdateService;
+
+	/**
+	 * Given an MDM Target (consisting of either a Patient or a Practitioner), find a suitable Person candidate for them,
+	 * or create one if one does not exist. Performs matching based on rules defined in empi-rules.json.
+	 * Does nothing if resource is determined to be not managed by MDM.
+	 *
+	 * @param theResource the incoming MDM target, which is either a Patient or Practitioner.
+	 * @param theMdmTransactionContext
+	 * @return an {@link TransactionLogMessages} which contains all informational messages related to MDM processing of this resource.
+	 */
+	public MdmTransactionContext updateMdmLinksForMdmTarget(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
+		if (MdmUtil.isMdmAllowed(theResource)) {
+			return doMdmUpdate(theResource, theMdmTransactionContext);
+		} else {
+			return null;
+		}
+	}
+
+	private MdmTransactionContext doMdmUpdate(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
+		CandidateList candidateList = myMdmGoldenResourceFindingSvc.findSourceResourceCandidates(theResource);
+
+		if (candidateList.isEmpty()) {
+			handleMdmWithNoCandidates(theResource, theMdmTransactionContext);
+		} else if (candidateList.exactlyOneMatch()) {
+			handleMdmWithSingleCandidate(theResource, candidateList.getOnlyMatch(), theMdmTransactionContext);
+		} else {
+			handleMdmWithMultipleCandidates(theResource, candidateList, theMdmTransactionContext);
+		}
+		return theMdmTransactionContext;
+	}
+
+	private void handleMdmWithMultipleCandidates(IAnyResource theResource, CandidateList theCandidateList, MdmTransactionContext theMdmTransactionContext) {
+		MatchedSourceResourceCandidate firstMatch = theCandidateList.getFirstMatch();
+		Long samplePersonPid = firstMatch.getCandidatePersonPid().getIdAsLong();
+		boolean allSamePerson = theCandidateList.stream()
+			.allMatch(candidate -> candidate.getCandidatePersonPid().getIdAsLong().equals(samplePersonPid));
+
+		if (allSamePerson) {
+			log(theMdmTransactionContext, "MDM received multiple match candidates, but they are all linked to the same person.");
+			handleMdmWithSingleCandidate(theResource, firstMatch, theMdmTransactionContext);
+		} else {
+			log(theMdmTransactionContext, "MDM received multiple match candidates, that were linked to different Persons. Setting POSSIBLE_DUPLICATES and POSSIBLE_MATCHES.");
+			//Set them all as POSSIBLE_MATCH
+			List<IAnyResource> persons = new ArrayList<>();
+			for (MatchedSourceResourceCandidate matchedSourceResourceCandidate : theCandidateList.getCandidates()) {
+				IAnyResource person = myMdmGoldenResourceFindingSvc
+					.getSourceResourceFromMatchedSourceResourceCandidate(matchedSourceResourceCandidate, theMdmTransactionContext.getResourceType());
+				MdmMatchOutcome outcome = MdmMatchOutcome.POSSIBLE_MATCH;
+				outcome.setEidMatch(theCandidateList.isEidMatch());
+				myMdmLinkSvc.updateLink(person, theResource, outcome, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+				persons.add(person);
+			}
+
+			//Set all Persons as POSSIBLE_DUPLICATE of the last person.
+			IAnyResource firstPerson = persons.get(0);
+			persons.subList(1, persons.size())
+				.forEach(possibleDuplicatePerson -> {
+					MdmMatchOutcome outcome = MdmMatchOutcome.POSSIBLE_DUPLICATE;
+					outcome.setEidMatch(theCandidateList.isEidMatch());
+					myMdmLinkSvc.updateLink(firstPerson, possibleDuplicatePerson, outcome, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+				});
+		}
+	}
+
+	private void handleMdmWithNoCandidates(IAnyResource theResource, MdmTransactionContext theMdmTransactionContext) {
+		log(theMdmTransactionContext, String.format("There were no matched candidates for MDM, creating a new %s.", theResource.getIdElement().getResourceType()));
+		IAnyResource newGoldenResource = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(theResource);
+		// TODO GGG :)
+		// 1. Get the right helper
+		// 2. Create source resoruce for the MDM target
+		// 3. UPDATE MDM LINK TABLE
+
+		myMdmLinkSvc.updateLink(newGoldenResource, theResource, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+	}
+
+	private void handleMdmCreate(IAnyResource theTargetResource, MatchedSourceResourceCandidate thePersonCandidate, MdmTransactionContext theMdmTransactionContext) {
+		log(theMdmTransactionContext, "MDM has narrowed down to one candidate for matching.");
+		IAnyResource sourceResource = myMdmGoldenResourceFindingSvc.getSourceResourceFromMatchedSourceResourceCandidate(thePersonCandidate, theMdmTransactionContext.getResourceType());
+
+		if (myGoldenResourceHelper.isPotentialDuplicate(sourceResource, theTargetResource)) {
+			log(theMdmTransactionContext, "Duplicate detected based on the fact that both resources have different external EIDs.");
+			IAnyResource newSourceResource = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(theTargetResource);
+			myMdmLinkSvc.updateLink(newSourceResource, theTargetResource, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+			myMdmLinkSvc.updateLink(newSourceResource, sourceResource, MdmMatchOutcome.POSSIBLE_DUPLICATE, MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+		} else {
+			if (thePersonCandidate.isMatch()) {
+				myGoldenResourceHelper.handleExternalEidAddition(sourceResource, theTargetResource, theMdmTransactionContext);
+				//TODO MDM GGG/NG: eventually we need to add survivorship rules of attributes here. Currently no data is copied over except EIDs.
+			}
+			myMdmLinkSvc.updateLink(sourceResource, theTargetResource, thePersonCandidate.getMatchResult(), MdmLinkSourceEnum.AUTO, theMdmTransactionContext);
+		}
+	}
+
+	private void handleMdmWithSingleCandidate(IAnyResource theResource, MatchedSourceResourceCandidate thePersonCandidate, MdmTransactionContext theMdmTransactionContext) {
+		log(theMdmTransactionContext, "MDM has narrowed down to one candidate for matching.");
+		if (theMdmTransactionContext.getRestOperation().equals(MdmTransactionContext.OperationType.UPDATE_RESOURCE)) {
+			myEidUpdateService.handleMdmUpdate(theResource, thePersonCandidate, theMdmTransactionContext);
+		} else {
+			handleMdmCreate(theResource, thePersonCandidate, theMdmTransactionContext);
+		}
+	}
+
+	private void log(MdmTransactionContext theMdmTransactionContext, String theMessage) {
+		theMdmTransactionContext.addTransactionLogMessage(theMessage);
+		ourLog.debug(theMessage);
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceDaoSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java
similarity index 88%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceDaoSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java
index 039b222c0e5..3b8317597e0 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceDaoSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome;
@@ -41,14 +41,14 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-public class EmpiResourceDaoSvc {
+public class MdmResourceDaoSvc {
 
 	private static final int MAX_MATCHING_PERSONS = 1000;
 
 	@Autowired
 	DaoRegistry myDaoRegistry;
 	@Autowired
-	IEmpiSettings myEmpiConfig;
+	IMdmSettings myMdmSettings;
 
 	public DaoMethodOutcome upsertSourceResource(IAnyResource theSourceResource, String theResourceType) {
 		IFhirResourceDao resourceDao = myDaoRegistry.getResourceDao(theResourceType);
@@ -66,7 +66,7 @@ public class EmpiResourceDaoSvc {
 	*/
 	public void removeGoldenResourceTag(IAnyResource theGoldenResource, String theResourcetype) {
 		IFhirResourceDao resourceDao = myDaoRegistry.getResourceDao(theResourcetype);
-		resourceDao.removeTag(theGoldenResource.getIdElement(), TagTypeEnum.TAG, EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, EmpiConstants.CODE_GOLDEN_RECORD);
+		resourceDao.removeTag(theGoldenResource.getIdElement(), TagTypeEnum.TAG, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD);
 	}
 
 	public IAnyResource readSourceResourceByPid(ResourcePersistentId theSourceResourcePid, String theResourceType) {
@@ -86,7 +86,7 @@ public class EmpiResourceDaoSvc {
 			return Optional.empty();
 		} else if (resources.size() > 1) {
 			throw new InternalErrorException("Found more than one active " +
-				EmpiConstants.CODE_HAPI_MDM_MANAGED +
+				MdmConstants.CODE_HAPI_MDM_MANAGED +
 				" Person with EID " +
 				theEid +
 				": " +
@@ -103,8 +103,8 @@ public class EmpiResourceDaoSvc {
 	private SearchParameterMap buildEidSearchParameterMap(String theTheEid) {
 		SearchParameterMap map = new SearchParameterMap();
 		map.setLoadSynchronous(true);
-		map.add("identifier", new TokenParam(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem(), theTheEid));
-		map.add("_tag", new TokenParam(EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, EmpiConstants.CODE_GOLDEN_RECORD));
+		map.add("identifier", new TokenParam(myMdmSettings.getMdmRules().getEnterpriseEIDSystem(), theTheEid));
+		map.add("_tag", new TokenParam(MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD));
 		return map;
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java
similarity index 52%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java
index 040ea575219..47b16277821 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -21,9 +21,10 @@ package ca.uhn.fhir.jpa.empi.svc;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.rules.json.EmpiResourceSearchParamJson;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson;
+import ca.uhn.fhir.mdm.util.MdmUtil;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,43 +33,48 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class EmpiResourceFilteringSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmResourceFilteringSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myMdmSettings;
 	@Autowired
-	EmpiSearchParamSvc myEmpiSearchParamSvc;
+	MdmSearchParamSvc myMdmSearchParamSvc;
 	@Autowired
 	FhirContext myFhirContext;
 
 	/**
-	 * Given a resource from the EMPI Channel, determine whether or not EMPI processing should occur on it.
+	 * Given a resource from the MDM Channel, determine whether or not MDM processing should occur on it.
 	 *
-	 * EMPI processing should occur if for any {@link EmpiResourceSearchParamJson) Search Param, the resource contains a value.
+	 * MDM processing should occur if for any {@link MdmResourceSearchParamJson ) Search Param, the resource contains a value.
 	 *
 	 * If the resource has no attributes that appear in the candidate search params, processing should be skipped, as there is not
-	 * sufficient information to perform meaningful EMPI processing. (For example, how can EMPI processing occur on a patient that has _no_ attributes?)
+	 * sufficient information to perform meaningful MDM processing. (For example, how can MDM processing occur on a patient that has _no_ attributes?)
 	 *
-	 * @param theResource the resource that you wish to check against EMPI rules.
+	 * @param theResource the resource that you wish to check against MDM rules.
 	 *
-	 * @return whether or not EMPI processing should proceed
+	 * @return whether or not MDM processing should proceed
 	 */
 	public boolean shouldBeProcessed(IAnyResource theResource) {
+		//TODO GGG ask KHS: Skip the infinite loop, whoops. Better way to do this? tighter subscription criteria?
+		if (MdmUtil.isMdmManaged(theResource)) {
+			ourLog.debug("MDM Message handler is dropping [{}] as it is MDM-managed.");
+			return false;
+		}
 		String resourceType = myFhirContext.getResourceType(theResource);
-		List<EmpiResourceSearchParamJson> candidateSearchParams = myEmpiSettings.getEmpiRules().getCandidateSearchParams();
+		List<MdmResourceSearchParamJson> candidateSearchParams = myMdmSettings.getMdmRules().getCandidateSearchParams();
 
 		if (candidateSearchParams.isEmpty()) {
 			return true;
 		}
 
 		boolean containsValueForSomeSearchParam = candidateSearchParams.stream()
-			.filter(csp -> myEmpiSearchParamSvc.searchParamTypeIsValidForResourceType(csp.getResourceType(), resourceType))
+			.filter(csp -> myMdmSearchParamSvc.searchParamTypeIsValidForResourceType(csp.getResourceType(), resourceType))
 			.flatMap(csp -> csp.getSearchParams().stream())
-			.map(searchParam -> myEmpiSearchParamSvc.getValueFromResourceForSearchParam(theResource, searchParam))
+			.map(searchParam -> myMdmSearchParamSvc.getValueFromResourceForSearchParam(theResource, searchParam))
 			.anyMatch(valueList -> !valueList.isEmpty());
 
-		ourLog.trace("Is {} suitable for EMPI processing? : {}", theResource.getId(), containsValueForSomeSearchParam);
+		ourLog.trace("Is {} suitable for MDM processing? : {}", theResource.getId(), containsValueForSomeSearchParam);
 		return containsValueForSomeSearchParam;
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiSearchParamSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java
similarity index 97%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiSearchParamSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java
index 9955c2fa047..db6d0461b3d 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiSearchParamSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -41,7 +41,7 @@ import javax.annotation.Nullable;
 import java.util.List;
 
 @Service
-public class EmpiSearchParamSvc implements ISearchParamRetriever {
+public class MdmSearchParamSvc implements ISearchParamRetriever {
 	@Autowired
 	FhirContext myFhirContext;
 	@Autowired
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiSubmitSvcImpl.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java
similarity index 65%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiSubmitSvcImpl.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java
index 81fa8271ce3..257a7a0f931 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiSubmitSvcImpl.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 /*-
  * #%L
@@ -20,10 +20,10 @@ package ca.uhn.fhir.jpa.empi.svc;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiChannelSubmitterSvc;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.api.IMdmChannelSubmitterSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.interceptor.model.RequestPartitionId;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
@@ -49,28 +49,28 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-public class EmpiSubmitSvcImpl implements IEmpiSubmitSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmSubmitSvcImpl implements IMdmSubmitSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
 	private DaoRegistry myDaoRegistry;
 
 	@Autowired
-	private EmpiSearchParamSvc myEmpiSearchParamSvc;
+	private MdmSearchParamSvc myMdmSearchParamSvc;
 
 	@Autowired
-	private IEmpiChannelSubmitterSvc myEmpiChannelSubmitterSvc;
+	private IMdmChannelSubmitterSvc myMdmChannelSubmitterSvc;
 
 	@Autowired
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myMdmSettings;
 
 	private static final int BUFFER_SIZE = 100;
 
 	@Override
 	@Transactional
-	public long submitAllTargetTypesToEmpi(@Nullable String theCriteria) {
-		long submittedCount = myEmpiSettings.getEmpiRules().getMdmTypes().stream()
-			.mapToLong(targetType -> submitTargetTypeToEmpi(targetType, theCriteria))
+	public long submitAllTargetTypesToMdm(@Nullable String theCriteria) {
+		long submittedCount = myMdmSettings.getMdmRules().getMdmTypes().stream()
+			.mapToLong(targetType -> submitTargetTypeToMdm(targetType, theCriteria))
 			.sum();
 
 		return submittedCount;
@@ -78,64 +78,64 @@ public class EmpiSubmitSvcImpl implements IEmpiSubmitSvc {
 
 	@Override
 	@Transactional
-	public long submitTargetTypeToEmpi(String theTargetType, @Nullable String theCriteria) {
+	public long submitTargetTypeToMdm(String theTargetType, @Nullable String theCriteria) {
 		if (theCriteria == null) {
-			ourLog.info("Submitting all resources of type {} to EMPI", theTargetType);
+			ourLog.info("Submitting all resources of type {} to MDM", theTargetType);
 		} else {
-			ourLog.info("Submitting resources of type {} with criteria {} to EMPI", theTargetType, theCriteria);
+			ourLog.info("Submitting resources of type {} with criteria {} to MDM", theTargetType, theCriteria);
 		}
 
 		validateTargetType(theTargetType);
-		SearchParameterMap spMap = myEmpiSearchParamSvc.getSearchParameterMapFromCriteria(theTargetType, theCriteria);
+		SearchParameterMap spMap = myMdmSearchParamSvc.getSearchParameterMapFromCriteria(theTargetType, theCriteria);
 		spMap.setLoadSynchronousUpTo(BUFFER_SIZE);
-		ISearchBuilder searchBuilder = myEmpiSearchParamSvc.generateSearchBuilderForType(theTargetType);
-		return submitAllMatchingResourcesToEmpiChannel(spMap, searchBuilder);
+		ISearchBuilder searchBuilder = myMdmSearchParamSvc.generateSearchBuilderForType(theTargetType);
+		return submitAllMatchingResourcesToMdmChannel(spMap, searchBuilder);
 	}
 
-	private long submitAllMatchingResourcesToEmpiChannel(SearchParameterMap theSpMap, ISearchBuilder theSearchBuilder) {
+	private long submitAllMatchingResourcesToMdmChannel(SearchParameterMap theSpMap, ISearchBuilder theSearchBuilder) {
 		SearchRuntimeDetails searchRuntimeDetails = new SearchRuntimeDetails(null, UUID.randomUUID().toString());
 		long total = 0;
 		try (IResultIterator query = theSearchBuilder.createQuery(theSpMap, searchRuntimeDetails, null, RequestPartitionId.defaultPartition())) {
 			Collection<ResourcePersistentId> pidBatch;
 			do {
 				pidBatch = query.getNextResultBatch(BUFFER_SIZE);
-				total += loadPidsAndSubmitToEmpiChannel(theSearchBuilder, pidBatch);
+				total += loadPidsAndSubmitToMdmChannel(theSearchBuilder, pidBatch);
 			} while (query.hasNext());
 		} catch (IOException theE) {
 			throw new InternalErrorException("Failure while attempting to query resources for " + ProviderConstants.OPERATION_MDM_SUBMIT, theE);
 		}
-		ourLog.info("EMPI Submit complete.  Submitted a total of {} resources.", total);
+		ourLog.info("MDM Submit complete.  Submitted a total of {} resources.", total);
 		return total;
 	}
 
 	/**
 	 * Given a collection of ResourcePersistentId objects, and a search builder, load the IBaseResources and submit them to
-	 * the EMPI channel for processing.
+	 * the MDM channel for processing.
 	 *
 	 * @param theSearchBuilder the related DAO search builder.
-	 * @param thePidsToSubmit The collection of PIDs whos resources you want to submit for EMPI processing.
+	 * @param thePidsToSubmit The collection of PIDs whos resources you want to submit for MDM processing.
 	 *
 	 * @return The total count of submitted resources.
 	 */
-	private long loadPidsAndSubmitToEmpiChannel(ISearchBuilder theSearchBuilder, Collection<ResourcePersistentId> thePidsToSubmit) {
+	private long loadPidsAndSubmitToMdmChannel(ISearchBuilder theSearchBuilder, Collection<ResourcePersistentId> thePidsToSubmit) {
 		List<IBaseResource> resourcesToSubmit = new ArrayList<>();
 		theSearchBuilder.loadResourcesByPid(thePidsToSubmit, Collections.emptyList(), resourcesToSubmit, false, null);
-		ourLog.info("Submitting {} resources to EMPI", resourcesToSubmit.size());
+		ourLog.info("Submitting {} resources to MDM", resourcesToSubmit.size());
 		resourcesToSubmit
-			.forEach(resource -> myEmpiChannelSubmitterSvc.submitResourceToEmpiChannel(resource));
+			.forEach(resource -> myMdmChannelSubmitterSvc.submitResourceToMdmChannel(resource));
 		return resourcesToSubmit.size();
 	}
 
 	@Override
 	@Transactional
 	public long submitPractitionerTypeToMdm(@Nullable String theCriteria) {
-		return submitTargetTypeToEmpi("Practitioner", theCriteria);
+		return submitTargetTypeToMdm("Practitioner", theCriteria);
 	}
 
 	@Override
 	@Transactional
 	public long submitPatientTypeToMdm(@Nullable String theCriteria) {
-		return submitTargetTypeToEmpi("Patient", theCriteria);
+		return submitTargetTypeToMdm("Patient", theCriteria);
 	}
 
 	@Override
@@ -144,12 +144,12 @@ public class EmpiSubmitSvcImpl implements IEmpiSubmitSvc {
 		validateTargetType(theId.getResourceType());
 		IFhirResourceDao resourceDao = myDaoRegistry.getResourceDao(theId.getResourceType());
 		IBaseResource read = resourceDao.read(theId);
-		myEmpiChannelSubmitterSvc.submitResourceToEmpiChannel(read);
+		myMdmChannelSubmitterSvc.submitResourceToMdmChannel(read);
 		return 1;
 	}
 
 	private void validateTargetType(String theResourceType) {
-		if(!myEmpiSettings.getEmpiRules().getMdmTypes().contains(theResourceType)) {
+		if(!myMdmSettings.getMdmRules().getMdmTypes().contains(theResourceType)) {
 			throw new InvalidRequestException(ProviderConstants.OPERATION_MDM_SUBMIT + " does not support resource type: " + theResourceType);
 		}
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/BaseCandidateFinder.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java
similarity index 91%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/BaseCandidateFinder.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java
index c1e687d0f86..b5c7788b2ee 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/BaseCandidateFinder.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -21,7 +21,7 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  */
 
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -31,7 +31,7 @@ public abstract class BaseCandidateFinder {
 	@Autowired
 	IdHelperService myIdHelperService;
 	@Autowired
-	EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	MdmLinkDaoSvc myMdmLinkDaoSvc;
 
 	CandidateList findCandidates(IAnyResource theTarget) {
 		CandidateList candidateList = new CandidateList(getStrategy());
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/CandidateList.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java
similarity index 97%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/CandidateList.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java
index 1714441eb78..af919aa1e11 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/CandidateList.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/CandidateStrategyEnum.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java
similarity index 71%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/CandidateStrategyEnum.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java
index 6524c6afc3a..f34cc9b0ae9 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/CandidateStrategyEnum.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -21,11 +21,11 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  */
 
 public enum CandidateStrategyEnum {
-	/** Find Person candidates based on matching EID */
+	/** Find Golden Resource candidates based on matching EID */
 	EID,
-	/** Find Person candidates based on a link already existing for the target resource */
+	/** Find Golden Resource candidates based on a link already existing for the target resource */
 	LINK,
-	/** Find Person candidates based on other targets that match the incoming target using the EMPI Matching rules */
+	/** Find Golden Resource candidates based on other targets that match the incoming target using the MDM Matching rules */
 	SCORE;
 
     public boolean isEidMatch() {
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByEidSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java
similarity index 76%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByEidSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java
index c56d2c2a98d..6ecf0b44deb 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByEidSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -20,11 +20,11 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.jpa.empi.svc.EmpiResourceDaoSvc;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.jpa.mdm.svc.MdmResourceDaoSvc;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
@@ -38,12 +38,12 @@ import java.util.Optional;
 @Service
 public class FindCandidateByEidSvc extends BaseCandidateFinder {
 
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
 	private EIDHelper myEIDHelper;
 	@Autowired
-	private EmpiResourceDaoSvc myEmpiResourceDaoSvc;
+	private MdmResourceDaoSvc myMdmResourceDaoSvc;
 
 	protected List<MatchedSourceResourceCandidate> findMatchSourceResourceCandidates(IAnyResource theBaseResource) {
 		List<MatchedSourceResourceCandidate> retval = new ArrayList<>();
@@ -51,11 +51,11 @@ public class FindCandidateByEidSvc extends BaseCandidateFinder {
 		List<CanonicalEID> eidFromResource = myEIDHelper.getExternalEid(theBaseResource);
 		if (!eidFromResource.isEmpty()) {
 			for (CanonicalEID eid : eidFromResource) {
-				Optional<IAnyResource> oFoundPerson = myEmpiResourceDaoSvc.searchGoldenResourceByEID(eid.getValue(), theBaseResource.getIdElement().getResourceType());
+				Optional<IAnyResource> oFoundPerson = myMdmResourceDaoSvc.searchGoldenResourceByEID(eid.getValue(), theBaseResource.getIdElement().getResourceType());
 				if (oFoundPerson.isPresent()) {
 					IAnyResource foundPerson = oFoundPerson.get();
 					Long pidOrNull = myIdHelperService.getPidOrNull(foundPerson);
-					MatchedSourceResourceCandidate mpc = new MatchedSourceResourceCandidate(new ResourcePersistentId(pidOrNull), EmpiMatchOutcome.EID_MATCH);
+					MatchedSourceResourceCandidate mpc = new MatchedSourceResourceCandidate(new ResourcePersistentId(pidOrNull), MdmMatchOutcome.EID_MATCH);
 					ourLog.debug("Matched {} by EID {}", foundPerson.getIdElement(), eid);
 					retval.add(mpc);
 				}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByLinkSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java
similarity index 84%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByLinkSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java
index 9b0e07a2b44..9db6a8b9919 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByLinkSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  * #L%
  */
 
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
@@ -33,10 +33,10 @@ import java.util.Optional;
 
 @Service
 public class FindCandidateByLinkSvc extends BaseCandidateFinder {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	/**
-	 * Attempt to find a currently matching Person, based on the presence of an {@link EmpiLink} entity.
+	 * Attempt to find a currently matching Person, based on the presence of an {@link MdmLink} entity.
 	 *
 	 * @param theTarget the {@link IAnyResource} that we want to find candidate Persons for.
 	 * @return an Optional list of {@link MatchedSourceResourceCandidate} indicating matches.
@@ -47,9 +47,9 @@ public class FindCandidateByLinkSvc extends BaseCandidateFinder {
 
 		Long targetPid = myIdHelperService.getPidOrNull(theTarget);
 		if (targetPid != null) {
-			Optional<EmpiLink> oLink = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(targetPid);
+			Optional<MdmLink> oLink = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(targetPid);
 			if (oLink.isPresent()) {
-				ResourcePersistentId personPid = new ResourcePersistentId(oLink.get().getSourceResourcePid());
+				ResourcePersistentId personPid = new ResourcePersistentId(oLink.get().getGoldenResourcePid());
 				ourLog.debug("Resource previously linked. Using existing link.");
 					retval.add(new MatchedSourceResourceCandidate(personPid, oLink.get()));
 			}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByScoreSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java
similarity index 64%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByScoreSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java
index 9ccc45b70bc..f899026dd3a 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/FindCandidateByScoreSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -21,13 +21,13 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.MatchedTarget;
-import ca.uhn.fhir.empi.log.Logs;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.MatchedTarget;
+import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -42,21 +42,21 @@ import java.util.stream.Collectors;
 
 @Service
 public class FindCandidateByScoreSvc extends BaseCandidateFinder {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
 	private FhirContext myFhirContext;
 	@Autowired
 	IdHelperService myIdHelperService;
 	@Autowired
-	private EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	private MdmLinkDaoSvc myMdmLinkDaoSvc;
 	@Autowired
-	private IEmpiMatchFinderSvc myEmpiMatchFinderSvc;
+	private IMdmMatchFinderSvc myMdmMatchFinderSvc;
 
 	/**
 	 * Attempt to find matching Persons by resolving them from similar Matching target resources, where target resource
-	 * can be either Patient or Practitioner. Runs EMPI logic over the existing Patient/Practitioners, then finds their
-	 * entries in the EmpiLink table, and returns all the matches found therein.
+	 * can be either Patient or Practitioner. Runs MDM logic over the existing Patient/Practitioners, then finds their
+	 * entries in the MdmLink table, and returns all the matches found therein.
 	 *
 	 * @param theTarget the {@link IBaseResource} which we want to find candidate Persons for.
 	 * @return an Optional list of {@link MatchedSourceResourceCandidate} indicating matches.
@@ -67,27 +67,26 @@ public class FindCandidateByScoreSvc extends BaseCandidateFinder {
 
 		List<Long> personPidsToExclude = getNoMatchPersonPids(theTarget);
 
+		List<MatchedTarget> matchedCandidates = myMdmMatchFinderSvc.getMatchedTargets(myFhirContext.getResourceType(theTarget), theTarget);
 
-		List<MatchedTarget> matchedCandidates = myEmpiMatchFinderSvc.getMatchedTargets(myFhirContext.getResourceType(theTarget), theTarget);
-
-		//Convert all possible match targets to their equivalent Persons by looking up in the EmpiLink table,
+		//Convert all possible match targets to their equivalent Persons by looking up in the MdmLink table,
 		//while ensuring that the matches aren't in our NO_MATCH list.
 		// The data flow is as follows ->
-		// MatchedTargetCandidate -> Person -> EmpiLink -> MatchedPersonCandidate
+		// MatchedTargetCandidate -> Person -> MdmLink -> MatchedPersonCandidate
 		matchedCandidates = matchedCandidates.stream().filter(mc -> mc.isMatch() || mc.isPossibleMatch()).collect(Collectors.toList());
 		for (MatchedTarget match : matchedCandidates) {
-			Optional<EmpiLink> optMatchEmpiLink = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(match.getTarget()));
-			if (!optMatchEmpiLink.isPresent()) {
+			Optional<MdmLink> optionalMdmLink = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(match.getTarget()));
+			if (!optionalMdmLink.isPresent()) {
 				continue;
 			}
 
-			EmpiLink matchEmpiLink = optMatchEmpiLink.get();
-			if (personPidsToExclude.contains(matchEmpiLink.getSourceResourcePid())) {
-				ourLog.info("Skipping EMPI on candidate person with PID {} due to manual NO_MATCH", matchEmpiLink.getSourceResourcePid());
+			MdmLink matchMdmLink = optionalMdmLink.get();
+			if (personPidsToExclude.contains(matchMdmLink.getGoldenResourcePid())) {
+				ourLog.info("Skipping MDM on candidate person with PID {} due to manual NO_MATCH", matchMdmLink.getGoldenResourcePid());
 				continue;
 			}
 
-			MatchedSourceResourceCandidate candidate = new MatchedSourceResourceCandidate(getResourcePersistentId(matchEmpiLink.getSourceResourcePid()), match.getMatchResult());
+			MatchedSourceResourceCandidate candidate = new MatchedSourceResourceCandidate(getResourcePersistentId(matchMdmLink.getGoldenResourcePid()), match.getMatchResult());
 			retval.add(candidate);
 		}
 		return retval;
@@ -95,9 +94,9 @@ public class FindCandidateByScoreSvc extends BaseCandidateFinder {
 
 	private List<Long> getNoMatchPersonPids(IBaseResource theBaseResource) {
 		Long targetPid = myIdHelperService.getPidOrNull(theBaseResource);
-		return myEmpiLinkDaoSvc.getEmpiLinksByTargetPidAndMatchResult(targetPid, EmpiMatchResultEnum.NO_MATCH)
+		return myMdmLinkDaoSvc.getMdmLinksByTargetPidAndMatchResult(targetPid, MdmMatchResultEnum.NO_MATCH)
 			.stream()
-			.map(EmpiLink::getSourceResourcePid)
+			.map(MdmLink::getGoldenResourcePid)
 			.collect(Collectors.toList());
 	}
 
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/MatchedSourceResourceCandidate.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java
similarity index 68%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/MatchedSourceResourceCandidate.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java
index f318890f40a..80379ac1630 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/MatchedSourceResourceCandidate.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -20,34 +20,34 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 
 public class MatchedSourceResourceCandidate {
 
 	private final ResourcePersistentId myCandidateSourceResourcePid;
-	private final EmpiMatchOutcome myEmpiMatchOutcome;
+	private final MdmMatchOutcome myMdmMatchOutcome;
 
-	public MatchedSourceResourceCandidate(ResourcePersistentId theCandidate, EmpiMatchOutcome theEmpiMatchOutcome) {
+	public MatchedSourceResourceCandidate(ResourcePersistentId theCandidate, MdmMatchOutcome theMdmMatchOutcome) {
 		myCandidateSourceResourcePid = theCandidate;
-		myEmpiMatchOutcome = theEmpiMatchOutcome;
+		myMdmMatchOutcome = theMdmMatchOutcome;
 	}
 
-	public MatchedSourceResourceCandidate(ResourcePersistentId thePersonPid, EmpiLink theEmpiLink) {
+	public MatchedSourceResourceCandidate(ResourcePersistentId thePersonPid, MdmLink theMdmLink) {
 		myCandidateSourceResourcePid = thePersonPid;
-		myEmpiMatchOutcome = new EmpiMatchOutcome(theEmpiLink.getVector(), theEmpiLink.getScore()).setMatchResultEnum(theEmpiLink.getMatchResult());
+		myMdmMatchOutcome = new MdmMatchOutcome(theMdmLink.getVector(), theMdmLink.getScore()).setMatchResultEnum(theMdmLink.getMatchResult());
 	}
 
 	public ResourcePersistentId getCandidatePersonPid() {
 		return myCandidateSourceResourcePid;
 	}
 
-	public EmpiMatchOutcome getMatchResult() {
-		return myEmpiMatchOutcome;
+	public MdmMatchOutcome getMatchResult() {
+		return myMdmMatchOutcome;
 	}
 
 	public boolean isMatch() {
-		return myEmpiMatchOutcome.isMatch();
+		return myMdmMatchOutcome.isMatch();
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiCandidateSearchCriteriaBuilderSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java
similarity index 84%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiCandidateSearchCriteriaBuilderSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java
index 9fee5912336..e30036ca922 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiCandidateSearchCriteriaBuilderSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  * #L%
  */
 
-import ca.uhn.fhir.empi.rules.json.EmpiResourceSearchParamJson;
-import ca.uhn.fhir.jpa.empi.svc.EmpiSearchParamSvc;
+import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson;
+import ca.uhn.fhir.jpa.mdm.svc.MdmSearchParamSvc;
 import ca.uhn.fhir.util.UrlUtil;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +35,9 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
-public class EmpiCandidateSearchCriteriaBuilderSvc {
+public class MdmCandidateSearchCriteriaBuilderSvc {
 	@Autowired
-	private EmpiSearchParamSvc myEmpiSearchParamSvc;
+	private MdmSearchParamSvc myMdmSearchParamSvc;
 
 	/*
 	 * Given a list of criteria upon which to block, a resource search parameter, and a list of values for that given search parameter,
@@ -46,14 +46,14 @@ public class EmpiCandidateSearchCriteriaBuilderSvc {
 	 * Patient?active=true&name.given=Gary,Grant&name.family=Graham
 	 */
 	@Nonnull
-	public Optional<String> buildResourceQueryString(String theResourceType, IAnyResource theResource, List<String> theFilterCriteria, @Nullable EmpiResourceSearchParamJson resourceSearchParam) {
+	public Optional<String> buildResourceQueryString(String theResourceType, IAnyResource theResource, List<String> theFilterCriteria, @Nullable MdmResourceSearchParamJson resourceSearchParam) {
 		List<String> criteria = new ArrayList<>();
 
 		// If there are candidate search params, then make use of them, otherwise, search with only the filters.
 		if (resourceSearchParam != null) {
 			resourceSearchParam.iterator().forEachRemaining(searchParam -> {
 				//to compare it to all known PERSON objects, using the overlapping search parameters that they have.
-				List<String> valuesFromResourceForSearchParam = myEmpiSearchParamSvc.getValueFromResourceForSearchParam(theResource, searchParam);
+				List<String> valuesFromResourceForSearchParam = myMdmSearchParamSvc.getValueFromResourceForSearchParam(theResource, searchParam);
 				if (!valuesFromResourceForSearchParam.isEmpty()) {
 					criteria.add(buildResourceMatchQuery(searchParam, valuesFromResourceForSearchParam));
 				}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiCandidateSearchSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java
similarity index 75%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiCandidateSearchSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java
index bae3f518447..d12864dbd50 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiCandidateSearchSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -20,14 +20,14 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.rules.json.EmpiFilterSearchParamJson;
-import ca.uhn.fhir.empi.rules.json.EmpiResourceSearchParamJson;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.rules.json.MdmFilterSearchParamJson;
+import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.svc.EmpiSearchParamSvc;
+import ca.uhn.fhir.jpa.mdm.svc.MdmSearchParamSvc;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -44,24 +44,24 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static ca.uhn.fhir.empi.api.EmpiConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE;
+import static ca.uhn.fhir.mdm.api.MdmConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE;
 
 @Service
-public class EmpiCandidateSearchSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmCandidateSearchSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private IEmpiSettings myEmpiConfig;
+	private IMdmSettings myMdmSettings;
 	@Autowired
-	private EmpiSearchParamSvc myEmpiSearchParamSvc;
+	private MdmSearchParamSvc myMdmSearchParamSvc;
 	@Autowired
 	private DaoRegistry myDaoRegistry;
 	@Autowired
 	private IdHelperService myIdHelperService;
 	@Autowired
-	private EmpiCandidateSearchCriteriaBuilderSvc myEmpiCandidateSearchCriteriaBuilderSvc;
+	private MdmCandidateSearchCriteriaBuilderSvc myMdmCandidateSearchCriteriaBuilderSvc;
 
-	public EmpiCandidateSearchSvc() {
+	public MdmCandidateSearchSvc() {
 	}
 
 	/**
@@ -75,16 +75,16 @@ public class EmpiCandidateSearchSvc {
 	 */
 	public Collection<IAnyResource> findCandidates(String theResourceType, IAnyResource theResource) {
 		Map<Long, IAnyResource> matchedPidsToResources = new HashMap<>();
-		List<EmpiFilterSearchParamJson> filterSearchParams = myEmpiConfig.getEmpiRules().getCandidateFilterSearchParams();
+		List<MdmFilterSearchParamJson> filterSearchParams = myMdmSettings.getMdmRules().getCandidateFilterSearchParams();
 		List<String> filterCriteria = buildFilterQuery(filterSearchParams, theResourceType);
-		List<EmpiResourceSearchParamJson> candidateSearchParams = myEmpiConfig.getEmpiRules().getCandidateSearchParams();
+		List<MdmResourceSearchParamJson> candidateSearchParams = myMdmSettings.getMdmRules().getCandidateSearchParams();
 
 		//If there are zero EmpiResourceSearchParamJson, we end up only making a single search, otherwise we
 		//must perform one search per EmpiResourceSearchParamJson.
 		if (candidateSearchParams.isEmpty()) {
 			searchForIdsAndAddToMap(theResourceType, theResource, matchedPidsToResources, filterCriteria, null);
 		} else {
-			for (EmpiResourceSearchParamJson resourceSearchParam : candidateSearchParams) {
+			for (MdmResourceSearchParamJson resourceSearchParam : candidateSearchParams) {
 
 				if (!isSearchParamForResource(theResourceType, resourceSearchParam)) {
 					continue;
@@ -102,7 +102,7 @@ public class EmpiCandidateSearchSvc {
 		return matchedPidsToResources.values();
 	}
 
-	private boolean isSearchParamForResource(String theResourceType, EmpiResourceSearchParamJson resourceSearchParam) {
+	private boolean isSearchParamForResource(String theResourceType, MdmResourceSearchParamJson resourceSearchParam) {
 		String resourceType = resourceSearchParam.getResourceType();
 		return resourceType.equals(theResourceType) || resourceType.equalsIgnoreCase(ALL_RESOURCE_SEARCH_PARAM_TYPE);
 	}
@@ -115,9 +115,9 @@ public class EmpiCandidateSearchSvc {
 	 * 4. Store all results in `theMatchedPidsToResources`
 	 */
 	@SuppressWarnings("rawtypes")
-	private void searchForIdsAndAddToMap(String theResourceType, IAnyResource theResource, Map<Long, IAnyResource> theMatchedPidsToResources, List<String> theFilterCriteria, EmpiResourceSearchParamJson resourceSearchParam) {
+	private void searchForIdsAndAddToMap(String theResourceType, IAnyResource theResource, Map<Long, IAnyResource> theMatchedPidsToResources, List<String> theFilterCriteria, MdmResourceSearchParamJson resourceSearchParam) {
 		//1.
-		Optional<String> oResourceCriteria = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString(theResourceType, theResource, theFilterCriteria, resourceSearchParam);
+		Optional<String> oResourceCriteria = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString(theResourceType, theResource, theFilterCriteria, resourceSearchParam);
 		if (!oResourceCriteria.isPresent()) {
 			return;
 		}
@@ -125,7 +125,7 @@ public class EmpiCandidateSearchSvc {
 		ourLog.debug("Searching for {} candidates with {}", theResourceType, resourceCriteria);
 
 		//2.
-		SearchParameterMap searchParameterMap = myEmpiSearchParamSvc.mapFromCriteria(theResourceType, resourceCriteria);
+		SearchParameterMap searchParameterMap = myMdmSearchParamSvc.mapFromCriteria(theResourceType, resourceCriteria);
 
 		searchParameterMap.setLoadSynchronous(true);
 
@@ -147,18 +147,18 @@ public class EmpiCandidateSearchSvc {
 		}
 	}
 
-	private List<String> buildFilterQuery(List<EmpiFilterSearchParamJson> theFilterSearchParams, String theResourceType) {
+	private List<String> buildFilterQuery(List<MdmFilterSearchParamJson> theFilterSearchParams, String theResourceType) {
 		return Collections.unmodifiableList(theFilterSearchParams.stream()
 			.filter(spFilterJson -> paramIsOnCorrectType(theResourceType, spFilterJson))
 			.map(this::convertToQueryString)
 			.collect(Collectors.toList()));
 	}
 
-	private boolean paramIsOnCorrectType(String theResourceType, EmpiFilterSearchParamJson spFilterJson) {
+	private boolean paramIsOnCorrectType(String theResourceType, MdmFilterSearchParamJson spFilterJson) {
 		return spFilterJson.getResourceType().equals(theResourceType) || spFilterJson.getResourceType().equalsIgnoreCase(ALL_RESOURCE_SEARCH_PARAM_TYPE);
 	}
 
-	private String convertToQueryString(EmpiFilterSearchParamJson theSpFilterJson) {
+	private String convertToQueryString(MdmFilterSearchParamJson theSpFilterJson) {
 		String qualifier = theSpFilterJson.getTokenParamModifierAsString();
 		return theSpFilterJson.getSearchParam() + qualifier + "=" + theSpFilterJson.getFixedValue();
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiSourceResourceFindingSvc.java b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java
similarity index 89%
rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiSourceResourceFindingSvc.java
rename to hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java
index 5090df88719..7327ea69ab4 100644
--- a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/candidate/EmpiSourceResourceFindingSvc.java
+++ b/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.svc.candidate;
+package ca.uhn.fhir.jpa.mdm.svc.candidate;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.jpa.empi.svc.candidate;
  * #L%
  */
 
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.jpa.empi.svc.EmpiResourceDaoSvc;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.jpa.mdm.svc.MdmResourceDaoSvc;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -30,11 +30,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmpiSourceResourceFindingSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmGoldenResourceFindingSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
-	private EmpiResourceDaoSvc myEmpiResourceDaoSvc;
+	private MdmResourceDaoSvc myMdmResourceDaoSvc;
 
 	@Autowired
 	private FindCandidateByEidSvc myFindCandidateByEidSvc;
@@ -78,6 +78,6 @@ public class EmpiSourceResourceFindingSvc {
 
 	public IAnyResource getSourceResourceFromMatchedSourceResourceCandidate(MatchedSourceResourceCandidate theMatchedSourceResourceCandidate, String theResourceType) {
 		ResourcePersistentId personPid = theMatchedSourceResourceCandidate.getCandidatePersonPid();
-		return myEmpiResourceDaoSvc.readSourceResourceByPid(personPid, theResourceType);
+		return myMdmResourceDaoSvc.readSourceResourceByPid(personPid, theResourceType);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvcTest.java
deleted file mode 100644
index a2733bc18a3..00000000000
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/dao/EmpiLinkDaoSvcTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package ca.uhn.fhir.jpa.empi.dao;
-
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
-import ca.uhn.fhir.jpa.util.TestUtil;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class EmpiLinkDaoSvcTest extends BaseEmpiR4Test {
-	@Autowired
-	EmpiLinkDaoSvc myEmpiLinkDaoSvc;
-	@Autowired
-	IEmpiSettings myEmpiSettings;
-
-	@Test
-	public void testCreate() {
-		EmpiLink empiLink = createResourcesAndBuildTestEmpiLink();
-		assertThat(empiLink.getCreated(), is(nullValue()));
-		assertThat(empiLink.getUpdated(), is(nullValue()));
-		myEmpiLinkDaoSvc.save(empiLink);
-		assertThat(empiLink.getCreated(), is(notNullValue()));
-		assertThat(empiLink.getUpdated(), is(notNullValue()));
-		assertTrue(empiLink.getUpdated().getTime() - empiLink.getCreated().getTime() < 1000);
-	}
-
-	@Test
-	public void testUpdate() {
-		EmpiLink createdLink = myEmpiLinkDaoSvc.save(createResourcesAndBuildTestEmpiLink());
-		assertThat(createdLink.getLinkSource(), is(EmpiLinkSourceEnum.MANUAL));
-		TestUtil.sleepOneClick();
-		createdLink.setLinkSource(EmpiLinkSourceEnum.AUTO);
-		EmpiLink updatedLink = myEmpiLinkDaoSvc.save(createdLink);
-		assertNotEquals(updatedLink.getCreated(), updatedLink.getUpdated());
-	}
-
-	@Test
-	public void testNew() {
-		EmpiLink newLink = myEmpiLinkDaoSvc.newEmpiLink();
-		EmpiRulesJson rules = myEmpiSettings.getEmpiRules();
-		assertEquals("1", rules.getVersion());
-		assertEquals(rules.getVersion(), newLink.getVersion());
-	}
-
-}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/entity/EmpiEnumTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/entity/EmpiEnumTest.java
deleted file mode 100644
index b7518ed65d8..00000000000
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/entity/EmpiEnumTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ca.uhn.fhir.jpa.empi.entity;
-
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class EmpiEnumTest {
-	@Test
-	public void empiEnumOrdinals() {
-		// This test is here to enforce that new values in these enums are always added to the end
-
-		assertEquals(6, EmpiMatchResultEnum.values().length);
-		assertEquals(EmpiMatchResultEnum.REDIRECT, EmpiMatchResultEnum.values()[EmpiMatchResultEnum.values().length - 1]);
-
-		assertEquals(2, EmpiLinkSourceEnum.values().length);
-		assertEquals(EmpiLinkSourceEnum.MANUAL, EmpiLinkSourceEnum.values()[EmpiLinkSourceEnum.values().length - 1]);
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiLinkHelper.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiLinkHelper.java
deleted file mode 100644
index ce025dd7875..00000000000
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiLinkHelper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package ca.uhn.fhir.jpa.empi.helper;
-
-import ca.uhn.fhir.jpa.dao.data.IEmpiLinkDao;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
-import ca.uhn.fhir.model.primitive.IdDt;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Service
-public class EmpiLinkHelper {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiLinkHelper.class);
-
-	@Autowired
-	IEmpiLinkDao myEmpiLinkDao;
-
-	@Transactional
-	public void logEmpiLinks() {
-		List<EmpiLink> links = myEmpiLinkDao.findAll();
-		ourLog.info("All EMPI Links:");
-		for (EmpiLink link : links) {
-			IdDt personId = link.getSourceResource().getIdDt().toVersionless();
-			IdDt targetId = link.getTarget().getIdDt().toVersionless();
-			ourLog.info("{}: {}, {}, {}, {}", link.getId(), personId, targetId, link.getMatchResult(), link.getLinkSource());
-		}
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseProviderR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseProviderR4Test.java
deleted file mode 100644
index 32ca3cd2857..00000000000
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseProviderR4Test.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package ca.uhn.fhir.jpa.empi.provider;
-
-import ca.uhn.fhir.empi.api.IEmpiControllerSvc;
-import ca.uhn.fhir.empi.api.IEmpiExpungeSvc;
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
-import ca.uhn.fhir.empi.provider.EmpiProviderR4;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import com.google.common.base.Charsets;
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-
-import java.io.IOException;
-
-public abstract class BaseProviderR4Test extends BaseEmpiR4Test {
-	EmpiProviderR4 myEmpiProviderR4;
-	@Autowired
-	private IEmpiMatchFinderSvc myEmpiMatchFinderSvc;
-	@Autowired
-	private IEmpiControllerSvc myEmpiControllerSvc;
-	@Autowired
-	private IEmpiExpungeSvc myEmpiResetSvc;
-	@Autowired
-	private IEmpiSubmitSvc myEmpiBatchSvc;
-	@Autowired
-	private EmpiSettings myEmpiSettings;
-
-	private String defaultScript;
-
-	protected void setEmpiRuleJson(String theString) throws IOException {
-		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
-		Resource resource = resourceLoader.getResource(theString);
-		String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
-		myEmpiSettings.setScriptText(json);
-
-	}
-
-	@BeforeEach
-	public void before() {
-		myEmpiProviderR4 = new EmpiProviderR4(myFhirContext, myEmpiControllerSvc, myEmpiMatchFinderSvc, myEmpiResetSvc, myEmpiBatchSvc);
-		defaultScript = myEmpiSettings.getScriptText();
-	}
-	@AfterEach
-	public void after() throws IOException {
-		super.after();
-		myEmpiSettings.setScriptText(defaultScript);
-	}
-}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/BaseEmpiR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java
similarity index 74%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/BaseEmpiR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java
index 948708481b7..ccff7168335 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/BaseEmpiR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java
@@ -1,33 +1,33 @@
-package ca.uhn.fhir.jpa.empi;
+package ca.uhn.fhir.jpa.mdm;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
-import ca.uhn.fhir.empi.rules.svc.EmpiResourceMatcherSvc;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.empi.util.EmpiUtil;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.mdm.util.MdmUtil;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome;
-import ca.uhn.fhir.jpa.dao.data.IEmpiLinkDao;
+import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.config.EmpiConsumerConfig;
-import ca.uhn.fhir.jpa.empi.config.EmpiSearchParameterLoader;
-import ca.uhn.fhir.jpa.empi.config.EmpiSubmitterConfig;
-import ca.uhn.fhir.jpa.empi.config.TestEmpiConfigR4;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.empi.matcher.IsLinkedTo;
-import ca.uhn.fhir.jpa.empi.matcher.IsMatchedToAPerson;
-import ca.uhn.fhir.jpa.empi.matcher.IsPossibleDuplicateOf;
-import ca.uhn.fhir.jpa.empi.matcher.IsPossibleLinkedTo;
-import ca.uhn.fhir.jpa.empi.matcher.IsPossibleMatchWith;
-import ca.uhn.fhir.jpa.empi.matcher.IsSameSourceResourceAs;
-import ca.uhn.fhir.jpa.empi.svc.EmpiMatchLinkSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.config.MdmConsumerConfig;
+import ca.uhn.fhir.jpa.mdm.config.MdmSearchParameterLoader;
+import ca.uhn.fhir.jpa.mdm.config.MdmSubmitterConfig;
+import ca.uhn.fhir.jpa.mdm.config.TestMdmConfigR4;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.matcher.IsLinkedTo;
+import ca.uhn.fhir.jpa.mdm.matcher.IsMatchedToAPerson;
+import ca.uhn.fhir.jpa.mdm.matcher.IsPossibleDuplicateOf;
+import ca.uhn.fhir.jpa.mdm.matcher.IsPossibleLinkedTo;
+import ca.uhn.fhir.jpa.mdm.matcher.IsPossibleMatchWith;
+import ca.uhn.fhir.jpa.mdm.matcher.IsSameSourceResourceAs;
+import ca.uhn.fhir.jpa.mdm.svc.MdmMatchLinkSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.jpa.searchparam.registry.SearchParamRegistryImpl;
 import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig;
@@ -70,9 +70,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.slf4j.LoggerFactory.getLogger;
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {EmpiSubmitterConfig.class, EmpiConsumerConfig.class, TestEmpiConfigR4.class, SubscriptionProcessorConfig.class})
-abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
-	private static final Logger ourLog = getLogger(BaseEmpiR4Test.class);
+@ContextConfiguration(classes = {MdmSubmitterConfig.class, MdmConsumerConfig.class, TestMdmConfigR4.class, SubscriptionProcessorConfig.class})
+abstract public class BaseMdmR4Test extends BaseJpaR4Test {
+	private static final Logger ourLog = getLogger(BaseMdmR4Test.class);
 
 	public static final String NAME_GIVEN_JANE = "Jane";
 	public static final String NAME_GIVEN_PAUL = "Paul";
@@ -98,21 +98,21 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 	@Autowired
 	protected IFhirResourceDao<Practitioner> myPractitionerDao;
 	@Autowired
-	protected EmpiResourceMatcherSvc myEmpiResourceMatcherSvc;
+	protected MdmResourceMatcherSvc myMdmResourceMatcherSvc;
 	@Autowired
-	protected IEmpiLinkDao myEmpiLinkDao;
+	protected IMdmLinkDao myMdmLinkDao;
 	@Autowired
-	protected EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	protected MdmLinkDaoSvc myMdmLinkDaoSvc;
 	@Autowired
 	protected IdHelperService myIdHelperService;
 	@Autowired
-	protected IEmpiSettings myEmpiConfig;
+	protected IMdmSettings myMdmSettings;
 	@Autowired
-	protected EmpiMatchLinkSvc myEmpiMatchLinkSvc;
+	protected MdmMatchLinkSvc myMdmMatchLinkSvc;
 	@Autowired
 	protected EIDHelper myEIDHelper;
 	@Autowired
-	EmpiSearchParameterLoader myEmpiSearchParameterLoader;
+	MdmSearchParameterLoader myMdmSearchParameterLoader;
 	@Autowired
 	SearchParamRegistryImpl mySearchParamRegistry;
 	@Autowired
@@ -131,13 +131,13 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 	@Override
 	@AfterEach
 	public void after() throws IOException {
-		myEmpiLinkDao.deleteAll();
-		assertEquals(0, myEmpiLinkDao.count());
+		myMdmLinkDao.deleteAll();
+		assertEquals(0, myMdmLinkDao.count());
 		super.after();
 	}
 
-	protected void saveLink(EmpiLink theEmpiLink) {
-		myEmpiLinkDaoSvc.save(theEmpiLink);
+	protected void saveLink(MdmLink theMdmLink) {
+		myMdmLinkDaoSvc.save(theMdmLink);
 	}
 //
 //	@Nonnull
@@ -167,13 +167,13 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 	}
 
 	@Nonnull
-	protected Patient createPatient(Patient thePatient, boolean theEmpiManaged, boolean isRedirect) {
-		if (theEmpiManaged) {
-			EmpiUtil.setEmpiManaged(thePatient);
+	protected Patient createPatient(Patient thePatient, boolean theMdmManaged, boolean isRedirect) {
+		if (theMdmManaged) {
+			MdmUtil.setEmpiManaged(thePatient);
 			if (isRedirect) {
-				EmpiUtil.setGoldenResourceRedirected(thePatient);
+				MdmUtil.setGoldenResourceRedirected(thePatient);
 			} else {
-				EmpiUtil.setGoldenResource(thePatient);
+				MdmUtil.setGoldenResource(thePatient);
 			}
 		}
 
@@ -313,40 +313,40 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 	}
 
 	protected void assertLinkCount(long theExpectedCount) {
-		assertEquals(theExpectedCount, myEmpiLinkDao.count());
+		assertEquals(theExpectedCount, myMdmLinkDao.count());
 	}
 
 	protected IAnyResource getGoldenResourceFromTargetResource(IAnyResource theBaseResource) {
 		String resourceType = theBaseResource.getIdElement().getResourceType();
 		IFhirResourceDao relevantDao = myDaoRegistry.getResourceDao(resourceType);
 
-		Optional<EmpiLink> matchedLinkForTargetPid = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(theBaseResource));
+		Optional<MdmLink> matchedLinkForTargetPid = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(theBaseResource));
 		if (matchedLinkForTargetPid.isPresent()) {
-			Long sourceResourcePid = matchedLinkForTargetPid.get().getSourceResourcePid();
+			Long sourceResourcePid = matchedLinkForTargetPid.get().getGoldenResourcePid();
 			return (IAnyResource) relevantDao.readByPid(new ResourcePersistentId(sourceResourcePid));
 		} else {
 			return null;
 		}
 	}
 
-	protected <T extends IBaseResource> T getTargetResourceFromEmpiLink(EmpiLink theEmpiLink, String theResourceType) {
+	protected <T extends IBaseResource> T getTargetResourceFromEmpiLink(MdmLink theMdmLink, String theResourceType) {
 		IFhirResourceDao resourceDao = myDaoRegistry.getResourceDao(theResourceType);
-		return (T) resourceDao.readByPid(new ResourcePersistentId(theEmpiLink.getSourceResourcePid()));
+		return (T) resourceDao.readByPid(new ResourcePersistentId(theMdmLink.getGoldenResourcePid()));
 	}
 
 	protected Patient addExternalEID(Patient thePatient, String theEID) {
-		thePatient.addIdentifier().setSystem(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem()).setValue(theEID);
+		thePatient.addIdentifier().setSystem(myMdmSettings.getMdmRules().getEnterpriseEIDSystem()).setValue(theEID);
 		return thePatient;
 	}
 
 	protected Patient clearExternalEIDs(Patient thePatient) {
-		thePatient.getIdentifier().removeIf(theIdentifier -> theIdentifier.getSystem().equalsIgnoreCase(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem()));
+		thePatient.getIdentifier().removeIf(theIdentifier -> theIdentifier.getSystem().equalsIgnoreCase(myMdmSettings.getMdmRules().getEnterpriseEIDSystem()));
 		return thePatient;
 	}
 
 	protected Patient createPatientAndUpdateLinks(Patient thePatient) {
 		thePatient = createPatient(thePatient);
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(thePatient, createContextForCreate("Patient"));
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(thePatient, createContextForCreate("Patient"));
 		return thePatient;
 	}
 
@@ -365,7 +365,7 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 
 	protected Medication createMedicationAndUpdateLinks(Medication theMedication) {
 		theMedication = createMedication(theMedication);
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(theMedication, createContextForCreate("Medication"));
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(theMedication, createContextForCreate("Medication"));
 		return theMedication;
 	}
 
@@ -387,7 +387,7 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 
 	protected Patient updatePatientAndUpdateLinks(Patient thePatient) {
 		thePatient = (Patient) myPatientDao.update(thePatient).getResource();
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(thePatient, createContextForUpdate(thePatient.getIdElement().getResourceType()));
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(thePatient, createContextForUpdate(thePatient.getIdElement().getResourceType()));
 		return thePatient;
 	}
 
@@ -395,32 +395,32 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 		thePractitioner.setActive(true);
 		DaoMethodOutcome daoMethodOutcome = myPractitionerDao.create(thePractitioner);
 		thePractitioner.setId(daoMethodOutcome.getId());
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(thePractitioner, createContextForCreate("Practitioner"));
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(thePractitioner, createContextForCreate("Practitioner"));
 		return thePractitioner;
 	}
 
 	protected Matcher<IAnyResource> sameSourceResourceAs(IAnyResource... theBaseResource) {
-		return IsSameSourceResourceAs.sameSourceResourceAs(myIdHelperService, myEmpiLinkDaoSvc, theBaseResource);
+		return IsSameSourceResourceAs.sameSourceResourceAs(myIdHelperService, myMdmLinkDaoSvc, theBaseResource);
 	}
 
 	protected Matcher<IAnyResource> linkedTo(IAnyResource... theBaseResource) {
-		return IsLinkedTo.linkedTo(myIdHelperService, myEmpiLinkDaoSvc, theBaseResource);
+		return IsLinkedTo.linkedTo(myIdHelperService, myMdmLinkDaoSvc, theBaseResource);
 	}
 
 	protected Matcher<IAnyResource> possibleLinkedTo(IAnyResource... theBaseResource) {
-		return IsPossibleLinkedTo.possibleLinkedTo(myIdHelperService, myEmpiLinkDaoSvc, theBaseResource);
+		return IsPossibleLinkedTo.possibleLinkedTo(myIdHelperService, myMdmLinkDaoSvc, theBaseResource);
 	}
 
 	protected Matcher<IAnyResource> possibleMatchWith(IAnyResource... theBaseResource) {
-		return IsPossibleMatchWith.possibleMatchWith(myIdHelperService, myEmpiLinkDaoSvc, theBaseResource);
+		return IsPossibleMatchWith.possibleMatchWith(myIdHelperService, myMdmLinkDaoSvc, theBaseResource);
 	}
 
 	protected Matcher<IAnyResource> possibleDuplicateOf(IAnyResource... theBaseResource) {
-		return IsPossibleDuplicateOf.possibleDuplicateOf(myIdHelperService, myEmpiLinkDaoSvc, theBaseResource);
+		return IsPossibleDuplicateOf.possibleDuplicateOf(myIdHelperService, myMdmLinkDaoSvc, theBaseResource);
 	}
 
-	protected Matcher<IAnyResource> matchedToAPerson() {
-		return IsMatchedToAPerson.matchedToAPerson(myIdHelperService, myEmpiLinkDaoSvc);
+	protected Matcher<IAnyResource> matchedToAGoldenResource() {
+		return IsMatchedToAPerson.matchedToAGoldenResource(myIdHelperService, myMdmLinkDaoSvc);
 	}
 
 	protected Patient getOnlyGoldenPatient() {
@@ -432,12 +432,12 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 
 	@Nonnull
 	protected List<IBaseResource> getAllGoldenPatients() {
-		return getPatientsByTag(EmpiConstants.CODE_GOLDEN_RECORD);
+		return getPatientsByTag(MdmConstants.CODE_GOLDEN_RECORD);
 	}
 
 	@Nonnull
 	protected List<IBaseResource> getAllRedirectedGoldenPatients() {
-		return getPatientsByTag(EmpiConstants.CODE_GOLDEN_RECORD_REDIRECTED);
+		return getPatientsByTag(MdmConstants.CODE_GOLDEN_RECORD_REDIRECTED);
 	}
 
 	@NotNull
@@ -445,52 +445,58 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 		SearchParameterMap map = new SearchParameterMap();
 		map.setLoadSynchronous(true);
 		//TODO GGG ensure that this tag search works effectively.
-		map.add("_tag", new TokenParam(EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, theCode));
+		map.add("_tag", new TokenParam(MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, theCode));
 		IBundleProvider bundle = myPatientDao.search(map);
 		return bundle.getResources(0, 999);
 	}
 
 
 	@Nonnull
-	protected EmpiLink createResourcesAndBuildTestEmpiLink() {
+	protected MdmLink createResourcesAndBuildTestMDMLink() {
 		Patient sourcePatient = createGoldenPatient();
 		Patient patient = createPatient();
 
-		EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink();
-		empiLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		empiLink.setMatchResult(EmpiMatchResultEnum.MATCH);
-		empiLink.setGoldenResourcePid(myIdHelperService.getPidOrNull(sourcePatient));
-		empiLink.setTargetPid(myIdHelperService.getPidOrNull(patient));
-		return empiLink;
+		MdmLink mdmLink = myMdmLinkDaoSvc.newMdmLink();
+		mdmLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		mdmLink.setMatchResult(MdmMatchResultEnum.MATCH);
+		mdmLink.setGoldenResourcePid(myIdHelperService.getPidOrNull(sourcePatient));
+		mdmLink.setTargetPid(myIdHelperService.getPidOrNull(patient));
+		return mdmLink;
 	}
 
-	protected void loadEmpiSearchParameters() {
-		myEmpiSearchParameterLoader.daoUpdateEmpiSearchParameters();
+	protected void loadMdmSearchParameters() {
+		myMdmSearchParameterLoader.daoUpdateMdmSearchParameters();
 		mySearchParamRegistry.forceRefresh();
 	}
 
 	protected void logAllLinks() {
 		ourLog.info("Logging all EMPI Links:");
-		List<EmpiLink> links = myEmpiLinkDao.findAll();
-		for (EmpiLink link : links) {
+		List<MdmLink> links = myMdmLinkDao.findAll();
+		for (MdmLink link : links) {
 			ourLog.info(link.toString());
 		}
 	}
 
-	protected void assertLinksMatchResult(EmpiMatchResultEnum... theExpectedValues) {
-		assertFields(EmpiLink::getMatchResult, theExpectedValues);
+	protected void assertLinksMatchResult(MdmMatchResultEnum... theExpectedValues) {
+		assertFields(MdmLink::getMatchResult, theExpectedValues);
 	}
 
 	protected void assertLinksCreatedNewResource(Boolean... theExpectedValues) {
-		assertFields(EmpiLink::getHadToCreateNewResource, theExpectedValues);
+		assertFields(MdmLink::getHadToCreateNewResource, theExpectedValues);
 	}
 
 	protected void assertLinksMatchedByEid(Boolean... theExpectedValues) {
-		assertFields(EmpiLink::getEidMatch, theExpectedValues);
+		assertFields(MdmLink::getEidMatch, theExpectedValues);
+	}
+	public SearchParameterMap buildGoldenResourceSearchParameterMap() {
+		SearchParameterMap spMap = new SearchParameterMap();
+		spMap.setLoadSynchronous(true);
+		spMap.add("_tag", new TokenParam(MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD));
+		return spMap;
 	}
 
-	private <T> void assertFields(Function<EmpiLink, T> theAccessor, T... theExpectedValues) {
-		List<EmpiLink> links = myEmpiLinkDao.findAll();
+	private <T> void assertFields(Function<MdmLink, T> theAccessor, T... theExpectedValues) {
+		List<MdmLink> links = myMdmLinkDao.findAll();
 		assertEquals(theExpectedValues.length, links.size());
 		for (int i = 0; i < links.size(); ++i) {
 			assertEquals(theExpectedValues[i], theAccessor.apply(links.get(i)), "Value at index " + i + " was not equal");
@@ -524,7 +530,7 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
 
 
 	protected void printLinks() {
-		myEmpiLinkDao.findAll().forEach(empiLink -> {
+		myMdmLinkDao.findAll().forEach(empiLink -> {
 			ourLog.info(String.valueOf(empiLink));
 		});
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/config/BaseTestEmpiConfig.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java
similarity index 65%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/config/BaseTestEmpiConfig.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java
index 2eeebefc5e9..2258e851d65 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/config/BaseTestEmpiConfig.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.jpa.empi.config;
+package ca.uhn.fhir.jpa.mdm.config;
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
-import ca.uhn.fhir.jpa.empi.helper.EmpiLinkHelper;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.mdm.rules.config.MdmSettings;
+import ca.uhn.fhir.jpa.mdm.helper.MdmLinkHelper;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,7 +15,7 @@ import org.springframework.core.io.Resource;
 import java.io.IOException;
 
 @Configuration
-public abstract class BaseTestEmpiConfig {
+public abstract class BaseTestMdmConfig {
 
 	@Value("${empi.prevent_eid_updates:true}")
 	boolean myPreventEidUpdates;
@@ -24,11 +24,11 @@ public abstract class BaseTestEmpiConfig {
 	boolean myPreventMultipleEids;
 
 	@Bean
-    IEmpiSettings empiSettings(EmpiRuleValidator theEmpiRuleValidator) throws IOException {
+	IMdmSettings mdmSettings(MdmRuleValidator theMdmRuleValidator) throws IOException {
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
 		Resource resource = resourceLoader.getResource("empi/empi-rules.json");
 		String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
-		return new EmpiSettings(theEmpiRuleValidator)
+		return new MdmSettings(theMdmRuleValidator)
 			.setEnabled(false)
 			.setScriptText(json)
 			.setPreventEidUpdates(myPreventEidUpdates)
@@ -36,7 +36,7 @@ public abstract class BaseTestEmpiConfig {
 	}
 
 	@Bean
-	EmpiLinkHelper empiLinkHelper() {
-		return new EmpiLinkHelper();
+	MdmLinkHelper mdmLinkHelper() {
+		return new MdmLinkHelper();
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/config/TestEmpiConfigR4.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java
similarity index 75%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/config/TestEmpiConfigR4.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java
index 50ae0500ed6..204db38ffdd 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/config/TestEmpiConfigR4.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.jpa.empi.config;
+package ca.uhn.fhir.jpa.mdm.config;
 
 import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;
 import ca.uhn.fhir.jpa.subscription.submit.config.SubscriptionSubmitterConfig;
 import org.springframework.context.annotation.Import;
 
 @Import({SubscriptionSubmitterConfig.class, SubscriptionChannelConfig.class})
-public class TestEmpiConfigR4 extends BaseTestEmpiConfig {
+public class TestMdmConfigR4 extends BaseTestMdmConfig {
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java
new file mode 100644
index 00000000000..5e054870000
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java
@@ -0,0 +1,55 @@
+package ca.uhn.fhir.jpa.mdm.dao;
+
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.jpa.util.TestUtil;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class MdmLinkDaoSvcTest extends BaseMdmR4Test {
+	@Autowired
+	MdmLinkDaoSvc myMdmLinkDaoSvc;
+	@Autowired
+	IMdmSettings myEmpiSettings;
+
+	@Test
+	public void testCreate() {
+		MdmLink mdmLink = createResourcesAndBuildTestMDMLink();
+		assertThat(mdmLink.getCreated(), is(nullValue()));
+		assertThat(mdmLink.getUpdated(), is(nullValue()));
+		myMdmLinkDaoSvc.save(mdmLink);
+		assertThat(mdmLink.getCreated(), is(notNullValue()));
+		assertThat(mdmLink.getUpdated(), is(notNullValue()));
+		assertTrue(mdmLink.getUpdated().getTime() - mdmLink.getCreated().getTime() < 1000);
+	}
+
+	@Test
+	public void testUpdate() {
+		MdmLink createdLink = myMdmLinkDaoSvc.save(createResourcesAndBuildTestMDMLink());
+		assertThat(createdLink.getLinkSource(), is(MdmLinkSourceEnum.MANUAL));
+		TestUtil.sleepOneClick();
+		createdLink.setLinkSource(MdmLinkSourceEnum.AUTO);
+		MdmLink updatedLink = myMdmLinkDaoSvc.save(createdLink);
+		assertNotEquals(updatedLink.getCreated(), updatedLink.getUpdated());
+	}
+
+	@Test
+	public void testNew() {
+		MdmLink newLink = myMdmLinkDaoSvc.newMdmLink();
+		MdmRulesJson rules = myEmpiSettings.getMdmRules();
+		assertEquals("1", rules.getVersion());
+		assertEquals(rules.getVersion(), newLink.getVersion());
+	}
+
+}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java
new file mode 100644
index 00000000000..8399033ad3b
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java
@@ -0,0 +1,20 @@
+package ca.uhn.fhir.jpa.mdm.entity;
+
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class MdmEnumTest {
+	@Test
+	public void empiEnumOrdinals() {
+		// This test is here to enforce that new values in these enums are always added to the end
+
+		assertEquals(6, MdmMatchResultEnum.values().length);
+		assertEquals(MdmMatchResultEnum.REDIRECT, MdmMatchResultEnum.values()[MdmMatchResultEnum.values().length - 1]);
+
+		assertEquals(2, MdmLinkSourceEnum.values().length);
+		assertEquals(MdmLinkSourceEnum.MANUAL, MdmLinkSourceEnum.values()[MdmLinkSourceEnum.values().length - 1]);
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/BaseEmpiHelper.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java
similarity index 73%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/BaseEmpiHelper.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java
index fab4e3c4895..1389c4c5ea1 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/BaseEmpiHelper.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java
@@ -1,11 +1,11 @@
-package ca.uhn.fhir.jpa.empi.helper;
+package ca.uhn.fhir.jpa.mdm.helper;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.empi.broker.EmpiQueueConsumerLoader;
-import ca.uhn.fhir.jpa.empi.config.EmpiSubscriptionLoader;
+import ca.uhn.fhir.jpa.mdm.broker.MdmQueueConsumerLoader;
+import ca.uhn.fhir.jpa.mdm.config.MdmSubscriptionLoader;
 import ca.uhn.fhir.jpa.subscription.channel.impl.LinkedBlockingChannel;
 import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionLoader;
 import ca.uhn.fhir.jpa.subscription.match.registry.SubscriptionRegistry;
@@ -27,21 +27,21 @@ import static org.mockito.Mockito.when;
 /**
  * How to use this Rule:
  * <p>
- * This rule is to be used whenever you want to have the EmpiInterceptor loaded, and be able
- * to execute creates/updates/deletes while being assured that all EMPI work has been done before exiting.
+ * This rule is to be used whenever you want to have the MdmInterceptor loaded, and be able
+ * to execute creates/updates/deletes while being assured that all MDM work has been done before exiting.
  * Provides two types of method:
  * <p>
- * 1. doUpdate/doCreate. These methods do not wait for Asynchronous EMPI work to be done. Use these when you are expecting
+ * 1. doUpdate/doCreate. These methods do not wait for Asynchronous MDM work to be done. Use these when you are expecting
  * the calls to fail, as those hooks will never be called.
  * <p>
- * 2. createWithLatch/updateWithLatch. These methods will await the EMPI hooks, which are only triggered post-EMPI processing
- * You should use these when you are expecting successful processing of the resource, and need to wait for async EMPI linking
+ * 2. createWithLatch/updateWithLatch. These methods will await the MDM hooks, which are only triggered post-MDM processing
+ * You should use these when you are expecting successful processing of the resource, and need to wait for async MDM linking
  * work to be done.
  * <p>
  * Note: all create/update functions take an optional isExternalHttpRequest boolean, to make it appear as though the request's
  * origin is an HTTP request.
  */
-public abstract class BaseEmpiHelper implements BeforeEachCallback, AfterEachCallback {
+public abstract class BaseMdmHelper implements BeforeEachCallback, AfterEachCallback {
 	@Mock
 	protected ServletRequestDetails myMockSrd;
 	@Mock
@@ -50,15 +50,15 @@ public abstract class BaseEmpiHelper implements BeforeEachCallback, AfterEachCal
 	protected RestfulServer myMockRestfulServer;
 	@Mock
 	protected FhirContext myMockFhirContext;
-	protected PointcutLatch myAfterEmpiLatch = new PointcutLatch(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED);
+	protected PointcutLatch myAfterMdmLatch = new PointcutLatch(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED);
 	@Autowired
-	EmpiQueueConsumerLoader myEmpiQueueConsumerLoader;
+	MdmQueueConsumerLoader myMdmQueueConsumerLoader;
 	@Autowired
 	SubscriptionRegistry mySubscriptionRegistry;
 	@Autowired
 	SubscriptionLoader mySubscriptionLoader;
 	@Autowired
-	EmpiSubscriptionLoader myEmpiSubscriptionLoader;
+	MdmSubscriptionLoader myMdmSubscriptionLoader;
 	@Mock
 	private IInterceptorBroadcaster myMockInterceptorBroadcaster;
 	@Autowired
@@ -66,9 +66,9 @@ public abstract class BaseEmpiHelper implements BeforeEachCallback, AfterEachCal
 
 	@Override
 	public void afterEach(ExtensionContext context) throws Exception {
-		myInterceptorService.unregisterInterceptor(myAfterEmpiLatch);
-		myAfterEmpiLatch.clear();
-		waitUntilEmpiQueueIsEmpty();
+		myInterceptorService.unregisterInterceptor(myAfterMdmLatch);
+		myAfterMdmLatch.clear();
+		waitUntilMdmQueueIsEmpty();
 	}
 
 	@Override
@@ -83,11 +83,11 @@ public abstract class BaseEmpiHelper implements BeforeEachCallback, AfterEachCal
 		when(myMockRestfulServer.getFhirContext()).thenReturn(myMockFhirContext);
 
 		//This sets up our basic interceptor, and also attached the latch so we can await the hook calls.
-		myInterceptorService.registerAnonymousInterceptor(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED, myAfterEmpiLatch);
+		myInterceptorService.registerAnonymousInterceptor(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED, myAfterMdmLatch);
 
 		// We need to call this because subscriptions will get deleted in @After cleanup
 		waitForActivatedSubscriptionCount(0);
-		myEmpiSubscriptionLoader.daoUpdateEmpiSubscriptions();
+		myMdmSubscriptionLoader.daoUpdateMdmSubscriptions();
 		mySubscriptionLoader.syncSubscriptions();
 		waitForActivatedSubscriptionCount(2);
 	}
@@ -97,12 +97,12 @@ public abstract class BaseEmpiHelper implements BeforeEachCallback, AfterEachCal
 		await("Active Subscription Count has reached " + theSize).until(() -> mySubscriptionRegistry.size() >= theSize);
 	}
 
-	private void waitUntilEmpiQueueIsEmpty() {
+	private void waitUntilMdmQueueIsEmpty() {
 		await().until(() -> getExecutorQueueSize() == 0);
 	}
 
 	public int getExecutorQueueSize() {
-		LinkedBlockingChannel channel = (LinkedBlockingChannel) myEmpiQueueConsumerLoader.getEmpiChannelForUnitTest();
+		LinkedBlockingChannel channel = (LinkedBlockingChannel) myMdmQueueConsumerLoader.getMdmChannelForUnitTest();
 		return channel.getQueueSizeForUnitTest();
 	}
 
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiHelperConfig.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java
similarity index 63%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiHelperConfig.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java
index 8e9a91e1c56..69184bcdb85 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiHelperConfig.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.jpa.empi.helper;
+package ca.uhn.fhir.jpa.mdm.helper;
 
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.mdm.rules.config.MdmSettings;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,27 +13,27 @@ import org.springframework.core.io.Resource;
 
 import java.io.IOException;
 
-public class EmpiHelperConfig {
+public class MdmHelperConfig {
 	@Bean
-	public EmpiHelperR4 empiHelperR4() {
-		return new EmpiHelperR4();
+	public MdmHelperR4 mdmHelperR4() {
+		return new MdmHelperR4();
 	}
 
-	@Value("${empi.prevent_eid_updates:false}")
+	@Value("${mdm.prevent_eid_updates:false}")
 	boolean myPreventEidUpdates;
 
-	@Value("${empi.prevent_multiple_eids:true}")
+	@Value("${mdm.prevent_multiple_eids:true}")
 	boolean myPreventMultipleEids;
 
 	@Primary
 	@Bean
-	IEmpiSettings empiSettings(EmpiRuleValidator theEmpiRuleValidator) throws IOException {
+	IMdmSettings empiSettings(MdmRuleValidator theMdmRuleValidator) throws IOException {
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
 		Resource resource = resourceLoader.getResource("empi/empi-rules.json");
 		String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
 
 		// Set Enabled to true, and set strict mode.
-		return new EmpiSettings(theEmpiRuleValidator)
+		return new MdmSettings(theMdmRuleValidator)
 			.setEnabled(true)
 			.setScriptText(json)
 			.setPreventEidUpdates(myPreventEidUpdates)
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiHelperR4.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java
similarity index 87%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiHelperR4.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java
index 9e7a3f19c00..86e47a7b1fb 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/helper/EmpiHelperR4.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.helper;
+package ca.uhn.fhir.jpa.mdm.helper;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
@@ -8,7 +8,7 @@ import ca.uhn.fhir.rest.server.TransactionLogMessages;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class EmpiHelperR4 extends BaseEmpiHelper {
+public class MdmHelperR4 extends BaseMdmHelper {
 	@Autowired
 	private FhirContext myFhirContext;
 	@Autowired
@@ -19,10 +19,10 @@ public class EmpiHelperR4 extends BaseEmpiHelper {
 	}
 
 	public OutcomeAndLogMessageWrapper createWithLatch(IBaseResource theBaseResource, boolean isExternalHttpRequest) throws InterruptedException {
-		myAfterEmpiLatch.setExpectedCount(1);
+		myAfterMdmLatch.setExpectedCount(1);
 		DaoMethodOutcome daoMethodOutcome = doCreateResource(theBaseResource, isExternalHttpRequest);
-		myAfterEmpiLatch.awaitExpected();
-		return new OutcomeAndLogMessageWrapper(daoMethodOutcome, myAfterEmpiLatch.getLatchInvocationParameterOfType(TransactionLogMessages.class));
+		myAfterMdmLatch.awaitExpected();
+		return new OutcomeAndLogMessageWrapper(daoMethodOutcome, myAfterMdmLatch.getLatchInvocationParameterOfType(TransactionLogMessages.class));
 	}
 
 	public OutcomeAndLogMessageWrapper updateWithLatch(IBaseResource theIBaseResource) throws InterruptedException {
@@ -30,10 +30,10 @@ public class EmpiHelperR4 extends BaseEmpiHelper {
 	}
 
 	public OutcomeAndLogMessageWrapper updateWithLatch(IBaseResource theIBaseResource, boolean isExternalHttpRequest) throws InterruptedException {
-		myAfterEmpiLatch.setExpectedCount(1);
+		myAfterMdmLatch.setExpectedCount(1);
 		DaoMethodOutcome daoMethodOutcome = doUpdateResource(theIBaseResource, isExternalHttpRequest);
-		myAfterEmpiLatch.awaitExpected();
-		return new OutcomeAndLogMessageWrapper(daoMethodOutcome, myAfterEmpiLatch.getLatchInvocationParameterOfType(TransactionLogMessages.class));
+		myAfterMdmLatch.awaitExpected();
+		return new OutcomeAndLogMessageWrapper(daoMethodOutcome, myAfterMdmLatch.getLatchInvocationParameterOfType(TransactionLogMessages.class));
 	}
 
 	public DaoMethodOutcome doCreateResource(IBaseResource theResource, boolean isExternalHttpRequest) {
@@ -52,7 +52,7 @@ public class EmpiHelperR4 extends BaseEmpiHelper {
 	/**
 	 * OutcomeAndLogMessageWrapper is a simple wrapper class which is _excellent_. It allows us to skip the fact that java doesn't allow
 	 * multiple returns, and wraps both the Method Outcome of the DAO, _and_ the TransactionLogMessages that were passed to the pointcut
-	 * by the EMPI module.
+	 * by the MDM module.
 	 */
 	public class OutcomeAndLogMessageWrapper {
 		DaoMethodOutcome myDaoMethodOutcome;
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java
new file mode 100644
index 00000000000..b479fd5192e
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java
@@ -0,0 +1,31 @@
+package ca.uhn.fhir.jpa.mdm.helper;
+
+import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.model.primitive.IdDt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class MdmLinkHelper {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmLinkHelper.class);
+
+	@Autowired
+	IMdmLinkDao myMdmLinkDao;
+
+	@Transactional
+	public void logMdmLinks() {
+		List<MdmLink> links = myMdmLinkDao.findAll();
+		ourLog.info("All MDM Links:");
+		for (MdmLink link : links) {
+			IdDt goldenResourceId = link.getGoldenResource().getIdDt().toVersionless();
+			IdDt targetId = link.getTarget().getIdDt().toVersionless();
+			ourLog.info("{}: {}, {}, {}, {}", link.getId(), goldenResourceId, targetId, link.getMatchResult(), link.getLinkSource());
+		}
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiExpungeTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java
similarity index 71%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiExpungeTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java
index ff2b74163ac..e7925fdca33 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiExpungeTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java
@@ -1,14 +1,13 @@
-package ca.uhn.fhir.jpa.empi.interceptor;
+package ca.uhn.fhir.jpa.mdm.interceptor;
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.jpa.api.config.DaoConfig;
 import ca.uhn.fhir.jpa.api.model.ExpungeOptions;
-import ca.uhn.fhir.jpa.dao.data.IEmpiLinkDao;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
 import ca.uhn.fhir.jpa.model.entity.ResourceTable;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import org.hl7.fhir.r4.model.Patient;
@@ -22,16 +21,14 @@ import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiExpungeTest extends BaseEmpiR4Test {
+public class MdmExpungeTest extends BaseMdmR4Test {
 
 	@Autowired
 	IInterceptorService myInterceptorService;
 	@Autowired
-	IEmpiStorageInterceptor myEmpiStorageInterceptor;
+	IMdmStorageInterceptor myEmpiStorageInterceptor;
 	@Autowired
 	DaoConfig myDaoConfig;
-	@Autowired
-	IEmpiLinkDao myEmpiLinkDao;
 	private ResourceTable myTargetEntity;
 	private ResourceTable mySourceEntity;
 	private IdDt myTargetId;
@@ -44,19 +41,19 @@ public class EmpiExpungeTest extends BaseEmpiR4Test {
 		myTargetId = myTargetEntity.getIdDt().toVersionless();
 		mySourceEntity = (ResourceTable) myPatientDao.create(new Patient()).getEntity();
 
-		EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink();
-		empiLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		empiLink.setMatchResult(EmpiMatchResultEnum.MATCH);
-		empiLink.setGoldenResourcePid(mySourceEntity.getId());
-		empiLink.setTargetPid(myTargetEntity.getId());
-		saveLink(empiLink);
+		MdmLink mdmLink = myMdmLinkDaoSvc.newMdmLink();
+		mdmLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		mdmLink.setMatchResult(MdmMatchResultEnum.MATCH);
+		mdmLink.setGoldenResourcePid(mySourceEntity.getId());
+		mdmLink.setTargetPid(myTargetEntity.getId());
+		saveLink(mdmLink);
 	}
 
 	@Test
 	public void testUninterceptedDeleteRemovesEMPIReference() {
-		assertEquals(1, myEmpiLinkDao.count());
+		assertEquals(1, myMdmLinkDao.count());
 		myPatientDao.delete(myTargetEntity.getIdDt());
-		assertEquals(1, myEmpiLinkDao.count());
+		assertEquals(1, myMdmLinkDao.count());
 		ExpungeOptions expungeOptions = new ExpungeOptions();
 		expungeOptions.setExpungeDeletedResources(true);
 		try {
@@ -68,7 +65,7 @@ public class EmpiExpungeTest extends BaseEmpiR4Test {
 		}
 		myInterceptorService.registerInterceptor(myEmpiStorageInterceptor);
 		myPatientDao.expunge(myTargetId.toVersionless(), expungeOptions, null);
-		assertEquals(0, myEmpiLinkDao.count());
+		assertEquals(0, myMdmLinkDao.count());
 	}
 
 	@AfterEach
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptorIT.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java
similarity index 55%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptorIT.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java
index 410954913d2..8af880b5ffe 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptorIT.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java
@@ -1,14 +1,13 @@
-package ca.uhn.fhir.jpa.empi.interceptor;
+package ca.uhn.fhir.jpa.mdm.interceptor;
 
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.rules.config.MdmSettings;
 import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.empi.helper.EmpiHelperConfig;
-import ca.uhn.fhir.jpa.empi.helper.EmpiHelperR4;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
-import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.mdm.helper.MdmHelperConfig;
+import ca.uhn.fhir.jpa.mdm.helper.MdmHelperR4;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
 import ca.uhn.fhir.rest.api.server.storage.ResourcePersistentId;
 import ca.uhn.fhir.rest.server.TransactionLogMessages;
@@ -17,6 +16,7 @@ import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.r4.model.Enumerations;
+import org.hl7.fhir.r4.model.Medication;
 import org.hl7.fhir.r4.model.Organization;
 import org.hl7.fhir.r4.model.Patient;
 import org.hl7.fhir.r4.model.Person;
@@ -32,11 +32,15 @@ import org.springframework.test.context.ContextConfiguration;
 import java.util.Date;
 import java.util.List;
 
-import static ca.uhn.fhir.empi.api.EmpiConstants.CODE_HAPI_MDM_MANAGED;
-import static ca.uhn.fhir.empi.api.EmpiConstants.SYSTEM_MDM_MANAGED;
+import static ca.uhn.fhir.mdm.api.MdmConstants.CODE_GOLDEN_RECORD;
+import static ca.uhn.fhir.mdm.api.MdmConstants.CODE_GOLDEN_RECORD_REDIRECTED;
+import static ca.uhn.fhir.mdm.api.MdmConstants.CODE_HAPI_MDM_MANAGED;
+import static ca.uhn.fhir.mdm.api.MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS;
+import static ca.uhn.fhir.mdm.api.MdmConstants.SYSTEM_MDM_MANAGED;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
@@ -46,31 +50,31 @@ import static org.junit.jupiter.api.Assertions.fail;
 import static org.slf4j.LoggerFactory.getLogger;
 
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-@ContextConfiguration(classes = {EmpiHelperConfig.class})
-public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
+@ContextConfiguration(classes = {MdmHelperConfig.class})
+public class MdmStorageInterceptorIT extends BaseMdmR4Test {
 
-	private static final Logger ourLog = getLogger(EmpiStorageInterceptorIT.class);
+	private static final Logger ourLog = getLogger(MdmStorageInterceptorIT.class);
 
 	@RegisterExtension
 	@Autowired
-	public EmpiHelperR4 myEmpiHelper;
+	public MdmHelperR4 myMdmHelper;
 	@Autowired
 	private IdHelperService myIdHelperService;
 
 	@BeforeEach
 	public void before() {
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 	}
 
 	@Test
 	public void testCreatePractitioner() throws InterruptedException {
-		myEmpiHelper.createWithLatch(buildPractitionerWithNameAndId("somename", "some_id"));
+		myMdmHelper.createWithLatch(buildPractitionerWithNameAndId("somename", "some_id"));
 		assertLinkCount(1);
 	}
 
 	@Test
 	public void testDeletePersonDeletesLinks() throws InterruptedException {
-		myEmpiHelper.createWithLatch(buildPaulPatient());
+		myMdmHelper.createWithLatch(buildPaulPatient());
 		assertLinkCount(1);
 		Patient sourcePatient = getOnlyGoldenPatient();
 		myPatientDao.delete(sourcePatient.getIdElement());
@@ -78,64 +82,88 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 	}
 
 	@Test
-	public void testCreatePersonWithEmpiTagForbidden() throws InterruptedException {
-		//Creating a person with the EMPI-MANAGED tag should fail
-		Person person = new Person();
-		person.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by EMPI");
+	public void testCreatePatientWithMdmTagForbidden() throws InterruptedException {
+		//Creating a person with the MDM-MANAGED tag should fail
+		Patient patient = new Patient();
+		patient.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by MDM");
 		try {
-			myEmpiHelper.doCreateResource(person, true);
+			myMdmHelper.doCreateResource(patient, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
-			assertEquals("Cannot create or modify Resources that are managed by EMPI.", e.getMessage());
+			assertThat(e.getMessage(), startsWith("Cannot create or modify Resources that are managed by MDM."));
 		}
 	}
 
 	@Test
-	public void testCreatingPersonWithInsufficentEMPIAttributesIsNotEMPIProcessed() throws InterruptedException {
-		myEmpiHelper.doCreateResource(new Patient(), true);
+	public void testCreatePatientWithGoldenRecordTagForbidden() throws InterruptedException {
+		Patient patient = new Patient();
+		patient.getMeta().addTag(SYSTEM_GOLDEN_RECORD_STATUS, CODE_GOLDEN_RECORD, "Golden Record");
+		try {
+			myMdmHelper.doCreateResource(patient, true);
+			fail();
+		} catch (ForbiddenOperationException e) {
+			assertThat(e.getMessage(), startsWith("Cannot create or modify Resources that are managed by MDM."));
+		}
+	}
+
+	@Test
+	public void testCreateMedicationWithGoldenRecordRedirectTagForbidden() throws InterruptedException {
+		Medication medication = new Medication();
+		medication.getMeta().addTag(SYSTEM_GOLDEN_RECORD_STATUS, CODE_GOLDEN_RECORD_REDIRECTED, "Golden Record");
+		try {
+			myMdmHelper.doCreateResource(medication, true);
+			fail();
+		} catch (ForbiddenOperationException e) {
+			assertThat(e.getMessage(), startsWith("Cannot create or modify Resources that are managed by MDM."));
+		}
+	}
+
+	@Test
+	public void testCreatingPersonWithInsufficentMDMAttributesIsNotMDMProcessed() throws InterruptedException {
+		myMdmHelper.doCreateResource(new Patient(), true);
 		assertLinkCount(0);
 	}
 
 	@Test
-	public void testCreatingPatientWithOneOrMoreMatchingAttributesIsEMPIProcessed() throws InterruptedException {
-		myEmpiHelper.createWithLatch(buildPaulPatient());
+	public void testCreatingPatientWithOneOrMoreMatchingAttributesIsMDMProcessed() throws InterruptedException {
+		myMdmHelper.createWithLatch(buildPaulPatient());
 		assertLinkCount(1);
 	}
 
 	@Test
-	public void testCreateOrganizationWithEmpiTagForbidden() throws InterruptedException {
-		//Creating a organization with the EMPI-MANAGED tag should fail
+	public void testCreateOrganizationWithMdmTagForbidden() throws InterruptedException {
+		//Creating a organization with the MDM-MANAGED tag should fail
 		Organization organization = new Organization();
-		organization.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by EMPI");
+		organization.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by MDM");
 		try {
-			myEmpiHelper.doCreateResource(organization, true);
+			myMdmHelper.doCreateResource(organization, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
-			assertEquals("Cannot create or modify Resources that are managed by EMPI.", e.getMessage());
+			assertThat(e.getMessage(), startsWith("Cannot create or modify Resources that are managed by MDM."));
 		}
 	}
 
 	@Test
-	public void testUpdateOrganizationWithEmpiTagForbidden() throws InterruptedException {
-		//Creating a organization with the EMPI-MANAGED tag should fail
+	public void testUpdateOrganizationWithMdmTagForbidden() throws InterruptedException {
+		//Creating a organization with the MDM-MANAGED tag should fail
 		Organization organization = new Organization();
-		myEmpiHelper.doCreateResource(organization, true);
-		organization.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by EMPI");
+		myMdmHelper.doCreateResource(organization, true);
+		organization.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by MDM");
 		try {
-			myEmpiHelper.doUpdateResource(organization, true);
+			myMdmHelper.doUpdateResource(organization, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
-			assertEquals("The HAPI-EMPI tag on a resource may not be changed once created.", e.getMessage());
+			assertEquals("The HAPI-MDM tag on a resource may not be changed once created.", e.getMessage());
 		}
 	}
 
 	@Test
-	public void testPersonRecordsManagedByEmpiAllShareSameTag() throws InterruptedException {
-		myEmpiHelper.createWithLatch(buildJanePatient());
-		myEmpiHelper.createWithLatch(buildPaulPatient());
+	public void testPersonRecordsManagedByMdmAllShareSameTag() throws InterruptedException {
+		myMdmHelper.createWithLatch(buildJanePatient());
+		myMdmHelper.createWithLatch(buildPaulPatient());
 
 		//TODO GGG MDM: this test is out of date, since we now are using golden record Patients
-		IBundleProvider search = myPatientDao.search(new SearchParameterMap().setLoadSynchronous(true));
+		IBundleProvider search = myPatientDao.search(buildGoldenResourceSearchParameterMap());
 		List<IBaseResource> resources = search.getResources(0, search.size());
 
 		for (IBaseResource person : resources) {
@@ -144,46 +172,46 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 	}
 
 	@Test
-	public void testNonEmpiManagedPersonCannotHaveEmpiManagedTagAddedToThem() {
+	public void testNonMdmManagedPersonCannotHaveMdmManagedTagAddedToThem() {
 		//Person created manually.
 		Person person = new Person();
-		DaoMethodOutcome daoMethodOutcome = myEmpiHelper.doCreateResource(person, true);
+		DaoMethodOutcome daoMethodOutcome = myMdmHelper.doCreateResource(person, true);
 		assertNotNull(daoMethodOutcome.getId());
 
-		//Updating that person to set them as EMPI managed is not allowed.
+		//Updating that person to set them as MDM managed is not allowed.
 		person.getMeta().addTag(SYSTEM_MDM_MANAGED, CODE_HAPI_MDM_MANAGED, "User is managed by EMPI");
 		try {
-			myEmpiHelper.doUpdateResource(person, true);
+			myMdmHelper.doUpdateResource(person, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
-			assertEquals("The HAPI-EMPI tag on a resource may not be changed once created.", e.getMessage());
+			assertEquals("The HAPI-MDM tag on a resource may not be changed once created.", e.getMessage());
 		}
 	}
 
 	@Test
-	public void testEmpiManagedPersonCannotBeModifiedByPersonUpdateRequest() throws InterruptedException {
+	public void testMdmManagedPersonCannotBeModifiedByPersonUpdateRequest() throws InterruptedException {
 		// When EMPI is enabled, only the EMPI system is allowed to modify Person links of Persons with the EMPI-MANAGED tag.
 		Patient patient = new Patient();
-		IIdType patientId = myEmpiHelper.createWithLatch(buildPaulPatient()).getDaoMethodOutcome().getId().toUnqualifiedVersionless();
+		IIdType patientId = myMdmHelper.createWithLatch(buildPaulPatient()).getDaoMethodOutcome().getId().toUnqualifiedVersionless();
 
 		patient.setId(patientId);
 
 		//Updating a Person who was created via EMPI should fail.
-		EmpiLink empiLink = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(patient)).get();
-		Long sourcePatientPid = empiLink.getSourceResourcePid();
+		MdmLink mdmLink = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(patient)).get();
+		Long sourcePatientPid = mdmLink.getGoldenResourcePid();
 		Patient empiSourcePatient = (Patient) myPatientDao.readByPid(new ResourcePersistentId(sourcePatientPid));
 		empiSourcePatient.setGender(Enumerations.AdministrativeGender.MALE);
 		try {
-			myEmpiHelper.doUpdateResource(empiSourcePatient, true);
+			myMdmHelper.doUpdateResource(empiSourcePatient, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
-			assertEquals("Cannot create or modify Resources that are managed by EMPI.", e.getMessage());
+			assertThat(e.getMessage(), startsWith("Cannot create or modify Resources that are managed by MDM."));
 		}
 	}
 
 	@Test
-	public void testEmpiPointcutReceivesTransactionLogMessages() throws InterruptedException {
-		EmpiHelperR4.OutcomeAndLogMessageWrapper wrapper = myEmpiHelper.createWithLatch(buildJanePatient());
+	public void testMdmPointcutReceivesTransactionLogMessages() throws InterruptedException {
+		MdmHelperR4.OutcomeAndLogMessageWrapper wrapper = myMdmHelper.createWithLatch(buildJanePatient());
 
 		TransactionLogMessages empiTransactionLogMessages = wrapper.getLogMessages();
 
@@ -197,12 +225,12 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 	@Test
 	public void testWhenASingularPatientUpdatesExternalEidThatPersonEidIsUpdated() throws InterruptedException {
 		Patient jane = addExternalEID(buildJanePatient(), "some_eid");
-		EmpiHelperR4.OutcomeAndLogMessageWrapper latch = myEmpiHelper.createWithLatch(jane);
+		MdmHelperR4.OutcomeAndLogMessageWrapper latch = myMdmHelper.createWithLatch(jane);
 		jane.setId(latch.getDaoMethodOutcome().getId());
 		clearExternalEIDs(jane);
 		jane = addExternalEID(jane, "some_new_eid");
 
-		EmpiHelperR4.OutcomeAndLogMessageWrapper outcomeWrapper = myEmpiHelper.updateWithLatch(jane);
+		MdmHelperR4.OutcomeAndLogMessageWrapper outcomeWrapper = myMdmHelper.updateWithLatch(jane);
 		IAnyResource person = getGoldenResourceFromTargetResource(jane);
 		List<CanonicalEID> externalEids = myEIDHelper.getExternalEid(person);
 		assertThat(externalEids, hasSize(1));
@@ -213,12 +241,12 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 	public void testWhenEidUpdatesAreDisabledForbidsUpdatesToEidsOnTargets() throws InterruptedException {
 		setPreventEidUpdates(true);
 		Patient jane = addExternalEID(buildJanePatient(), "some_eid");
-		EmpiHelperR4.OutcomeAndLogMessageWrapper latch = myEmpiHelper.createWithLatch(jane);
+		MdmHelperR4.OutcomeAndLogMessageWrapper latch = myMdmHelper.createWithLatch(jane);
 		jane.setId(latch.getDaoMethodOutcome().getId());
 		clearExternalEIDs(jane);
 		jane = addExternalEID(jane, "some_new_eid");
 		try {
-			myEmpiHelper.doUpdateResource(jane, true);
+			myMdmHelper.doUpdateResource(jane, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
 			assertThat(e.getMessage(), is(equalTo("While running with EID updates disabled, EIDs may not be updated on Patient/Practitioner resources")));
@@ -233,7 +261,7 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 		addExternalEID(patient, "123");
 		addExternalEID(patient, "456");
 		try {
-			myEmpiHelper.doCreateResource(patient, true);
+			myMdmHelper.doCreateResource(patient, true);
 			fail();
 		} catch (ForbiddenOperationException e) {
 			assertThat(e.getMessage(), is(equalTo("While running with multiple EIDs disabled, Patient/Practitioner resources may have at most one EID.")));
@@ -243,7 +271,7 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 	}
 
 	@Test
-	public void testInterceptorHandlesNonEmpiResources() {
+	public void testInterceptorHandlesNonMdmResources() {
 		setPreventEidUpdates(true);
 
 		//Create some arbitrary resource.
@@ -256,20 +284,20 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 		fooSp.setXpathUsage(org.hl7.fhir.r4.model.SearchParameter.XPathUsageType.NORMAL);
 		fooSp.setStatus(org.hl7.fhir.r4.model.Enumerations.PublicationStatus.ACTIVE);
 
-		myEmpiHelper.doCreateResource(fooSp, true);
+		myMdmHelper.doCreateResource(fooSp, true);
 		fooSp.setXpathUsage(SearchParameter.XPathUsageType.PHONETIC);
-		myEmpiHelper.doUpdateResource(fooSp, true);
+		myMdmHelper.doUpdateResource(fooSp, true);
 	}
 
 	@Test
 	public void testPatientsWithNoEIDCanBeUpdated() throws InterruptedException {
 		setPreventEidUpdates(true);
 		Patient p = buildPaulPatient();
-		EmpiHelperR4.OutcomeAndLogMessageWrapper wrapper = myEmpiHelper.createWithLatch(p);
+		MdmHelperR4.OutcomeAndLogMessageWrapper wrapper = myMdmHelper.createWithLatch(p);
 
 		p.setId(wrapper.getDaoMethodOutcome().getId());
 		p.setBirthDate(new Date());
-		myEmpiHelper.updateWithLatch(p);
+		myMdmHelper.updateWithLatch(p);
 		setPreventEidUpdates(false);
 	}
 
@@ -277,19 +305,19 @@ public class EmpiStorageInterceptorIT extends BaseEmpiR4Test {
 	public void testPatientsCanHaveEIDAddedInStrictMode() throws InterruptedException {
 		setPreventEidUpdates(true);
 		Patient p = buildPaulPatient();
-		EmpiHelperR4.OutcomeAndLogMessageWrapper messageWrapper = myEmpiHelper.createWithLatch(p);
+		MdmHelperR4.OutcomeAndLogMessageWrapper messageWrapper = myMdmHelper.createWithLatch(p);
 		p.setId(messageWrapper.getDaoMethodOutcome().getId());
 		addExternalEID(p, "external eid");
-		myEmpiHelper.updateWithLatch(p);
+		myMdmHelper.updateWithLatch(p);
 		setPreventEidUpdates(false);
 	}
 
 	private void setPreventEidUpdates(boolean thePrevent) {
-		((EmpiSettings) myEmpiConfig).setPreventEidUpdates(thePrevent);
+		((MdmSettings) myMdmSettings).setPreventEidUpdates(thePrevent);
 	}
 
 	private void setPreventMultipleEids(boolean thePrevent) {
-		((EmpiSettings) myEmpiConfig).setPreventMultipleEids(thePrevent);
+		((MdmSettings) myMdmSettings).setPreventMultipleEids(thePrevent);
 	}
 
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/BaseSourceResourceMatcher.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java
similarity index 50%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/BaseSourceResourceMatcher.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java
index 3ef10370680..d66d905ccb4 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/BaseSourceResourceMatcher.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java
@@ -1,11 +1,10 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.util.EmpiUtil;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.util.MdmUtil;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hamcrest.TypeSafeMatcher;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.slf4j.Logger;
@@ -22,13 +21,13 @@ public abstract class BaseSourceResourceMatcher extends TypeSafeMatcher<IAnyReso
 	private static final Logger ourLog = LoggerFactory.getLogger(BaseSourceResourceMatcher.class);
 
 	protected IdHelperService myIdHelperService;
-	protected EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	protected MdmLinkDaoSvc myMdmLinkDaoSvc;
 	protected Collection<IAnyResource> myBaseResources;
 	protected String myTargetType;
 
-	protected BaseSourceResourceMatcher(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
+	protected BaseSourceResourceMatcher(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
 		myIdHelperService = theIdHelperService;
-		myEmpiLinkDaoSvc = theEmpiLinkDaoSvc;
+		myMdmLinkDaoSvc = theMdmLinkDaoSvc;
 		myBaseResources = Arrays.stream(theBaseResource).collect(Collectors.toList());
 	}
 
@@ -36,39 +35,39 @@ public abstract class BaseSourceResourceMatcher extends TypeSafeMatcher<IAnyReso
 	protected Long getMatchedResourcePidFromResource(IAnyResource theResource) {
 		Long retval;
 
-		boolean isGoldenRecord = EmpiUtil.isEmpiManaged(theResource);
+		boolean isGoldenRecord = MdmUtil.isMdmManaged(theResource);
 		if (isGoldenRecord) {
 			return myIdHelperService.getPidOrNull(theResource);
 		}
-		EmpiLink matchLink = getMatchedEmpiLink(theResource);
+		MdmLink matchLink = getMatchedEmpiLink(theResource);
 
 		if (matchLink == null) {
 			return null;
 		} else {
-			retval = matchLink.getSourceResourcePid();
-			myTargetType = matchLink.getEmpiTargetType();
+			retval = matchLink.getGoldenResourcePid();
+			myTargetType = matchLink.getMdmTargetType();
 		}
 		return retval;
 	}
 
 	protected List<Long> getPossibleMatchedSourceResourcePidsFromTarget(IAnyResource theBaseResource) {
-		return getEmpiLinksForTarget(theBaseResource, EmpiMatchResultEnum.POSSIBLE_MATCH).stream().map(EmpiLink::getSourceResourcePid).collect(Collectors.toList());
+		return getEmpiLinksForTarget(theBaseResource, MdmMatchResultEnum.POSSIBLE_MATCH).stream().map(MdmLink::getGoldenResourcePid).collect(Collectors.toList());
 	}
 
-	protected EmpiLink getMatchedEmpiLink(IAnyResource thePatientOrPractitionerResource) {
-		List<EmpiLink> empiLinks = getEmpiLinksForTarget(thePatientOrPractitionerResource, EmpiMatchResultEnum.MATCH);
-		if (empiLinks.size() == 0) {
+	protected MdmLink getMatchedEmpiLink(IAnyResource thePatientOrPractitionerResource) {
+		List<MdmLink> mdmLinks = getEmpiLinksForTarget(thePatientOrPractitionerResource, MdmMatchResultEnum.MATCH);
+		if (mdmLinks.size() == 0) {
 			return null;
-		} else if (empiLinks.size() == 1) {
-			return empiLinks.get(0);
+		} else if (mdmLinks.size() == 1) {
+			return mdmLinks.get(0);
 		} else {
-			throw new IllegalStateException("Its illegal to have more than 1 match for a given target! we found " + empiLinks.size() + " for resource with id: " + thePatientOrPractitionerResource.getIdElement().toUnqualifiedVersionless());
+			throw new IllegalStateException("Its illegal to have more than 1 match for a given target! we found " + mdmLinks.size() + " for resource with id: " + thePatientOrPractitionerResource.getIdElement().toUnqualifiedVersionless());
 		}
 	}
 
-	protected List<EmpiLink> getEmpiLinksForTarget(IAnyResource theTargetResource, EmpiMatchResultEnum theMatchResult) {
+	protected List<MdmLink> getEmpiLinksForTarget(IAnyResource theTargetResource, MdmMatchResultEnum theMatchResult) {
 		Long pidOrNull = myIdHelperService.getPidOrNull(theTargetResource);
-		List<EmpiLink> matchLinkForTarget = myEmpiLinkDaoSvc.getEmpiLinksByTargetPidAndMatchResult(pidOrNull, theMatchResult);
+		List<MdmLink> matchLinkForTarget = myMdmLinkDaoSvc.getMdmLinksByTargetPidAndMatchResult(pidOrNull, theMatchResult);
 		if (!matchLinkForTarget.isEmpty()) {
 			return matchLinkForTarget;
 		} else {
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsLinkedTo.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java
similarity index 73%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsLinkedTo.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java
index 6d6097a5d88..f06713f06d9 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsLinkedTo.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -19,8 +19,8 @@ public class IsLinkedTo extends BaseSourceResourceMatcher {
 	private List<Long> baseResourcePersonPids;
 	private Long incomingResourcePersonPid;
 
-	protected IsLinkedTo(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		super(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	protected IsLinkedTo(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 
 
@@ -42,7 +42,7 @@ public class IsLinkedTo extends BaseSourceResourceMatcher {
 	public void describeTo(Description theDescription) {
 	}
 
-	public static Matcher<IAnyResource> linkedTo(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		return new IsLinkedTo(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	public static Matcher<IAnyResource> linkedTo(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		return new IsLinkedTo(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsMatchedToAPerson.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java
similarity index 51%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsMatchedToAPerson.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java
index 4d4fcd9d1e5..d4b75908ca8 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsMatchedToAPerson.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -13,16 +13,16 @@ import java.util.Optional;
 public class IsMatchedToAPerson extends TypeSafeMatcher<IAnyResource> {
 
 	private final IdHelperService myIdHelperService;
-	private final EmpiLinkDaoSvc myEmpiLinkDaoSvc;
+	private final MdmLinkDaoSvc myMdmLinkDaoSvc;
 
-	public IsMatchedToAPerson(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc) {
+	public IsMatchedToAPerson(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc) {
 		myIdHelperService = theIdHelperService;
-		myEmpiLinkDaoSvc = theEmpiLinkDaoSvc;
+		myMdmLinkDaoSvc = theMdmLinkDaoSvc;
 	}
 
 	@Override
 	protected boolean matchesSafely(IAnyResource theIncomingResource) {
-		Optional<EmpiLink> matchedLinkForTargetPid = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(theIncomingResource));
+		Optional<MdmLink> matchedLinkForTargetPid = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(theIncomingResource));
 		return matchedLinkForTargetPid.isPresent();
 	}
 
@@ -31,7 +31,7 @@ public class IsMatchedToAPerson extends TypeSafeMatcher<IAnyResource> {
 		theDescription.appendText("patient/practitioner was not linked to a Person.");
 	}
 
-	public static Matcher<IAnyResource> matchedToAPerson(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc) {
-		return new IsMatchedToAPerson(theIdHelperService, theEmpiLinkDaoSvc);
+	public static Matcher<IAnyResource> matchedToAGoldenResource(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc) {
+		return new IsMatchedToAPerson(theIdHelperService, theMdmLinkDaoSvc);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleDuplicateOf.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java
similarity index 54%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleDuplicateOf.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java
index f18cc8ba5dc..443baac8649 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleDuplicateOf.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -14,13 +14,13 @@ import java.util.stream.Collectors;
 
 public class IsPossibleDuplicateOf extends BaseSourceResourceMatcher {
 	/**
-	 * Matcher with tells us if there is an EmpiLink with between these two resources that are considered POSSIBLE DUPLICATE.
+	 * Matcher with tells us if there is an MdmLink with between these two resources that are considered POSSIBLE DUPLICATE.
 	 * For use only on persons.
 	 */
 	private Long incomingPersonPid;
 
-	protected IsPossibleDuplicateOf(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		super(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	protected IsPossibleDuplicateOf(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 
 	@Override
@@ -36,9 +36,9 @@ public class IsPossibleDuplicateOf extends BaseSourceResourceMatcher {
 		//Returns true if there is a POSSIBLE_DUPLICATE between the incoming resource, and all of the resources passed in via the constructor.
 		return personPidsToMatch.stream()
 			.map(baseResourcePid -> {
-				Optional<EmpiLink> duplicateLink = myEmpiLinkDaoSvc.getEmpiLinksByPersonPidTargetPidAndMatchResult(baseResourcePid, incomingPersonPid, EmpiMatchResultEnum.POSSIBLE_DUPLICATE);
+				Optional<MdmLink> duplicateLink = myMdmLinkDaoSvc.getMdmLinksByPersonPidTargetPidAndMatchResult(baseResourcePid, incomingPersonPid, MdmMatchResultEnum.POSSIBLE_DUPLICATE);
 				if (!duplicateLink.isPresent()) {
-					duplicateLink = myEmpiLinkDaoSvc.getEmpiLinksByPersonPidTargetPidAndMatchResult(incomingPersonPid, baseResourcePid, EmpiMatchResultEnum.POSSIBLE_DUPLICATE);
+					duplicateLink = myMdmLinkDaoSvc.getMdmLinksByPersonPidTargetPidAndMatchResult(incomingPersonPid, baseResourcePid, MdmMatchResultEnum.POSSIBLE_DUPLICATE);
 				}
 				return duplicateLink;
 			}).allMatch(Optional::isPresent);
@@ -46,16 +46,16 @@ public class IsPossibleDuplicateOf extends BaseSourceResourceMatcher {
 
 	@Override
 	public void describeTo(Description theDescription) {
-		theDescription.appendText("Person was not duplicate of Person/" + incomingPersonPid);
+		theDescription.appendText("Resource was not duplicate of Resource/" + incomingPersonPid);
 	}
 
 	@Override
 	protected void describeMismatchSafely(IAnyResource item, Description mismatchDescription) {
 		super.describeMismatchSafely(item, mismatchDescription);
-		mismatchDescription.appendText("No Empi Link With POSSIBLE_DUPLICATE was found");
+		mismatchDescription.appendText("No MdmLink With POSSIBLE_DUPLICATE was found");
 	}
 
-	public static Matcher<IAnyResource> possibleDuplicateOf(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		return new IsPossibleDuplicateOf(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	public static Matcher<IAnyResource> possibleDuplicateOf(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		return new IsPossibleDuplicateOf(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleLinkedTo.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java
similarity index 76%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleLinkedTo.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java
index 200f478529e..dbb575e578b 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleLinkedTo.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -19,8 +19,8 @@ public class IsPossibleLinkedTo extends BaseSourceResourceMatcher {
 	private List<Long> baseResourcePersonPids;
 	private Long incomingResourcePersonPid;
 
-	protected IsPossibleLinkedTo(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theTargetResources) {
-		super(theIdHelperService, theEmpiLinkDaoSvc, theTargetResources);
+	protected IsPossibleLinkedTo(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theTargetResources) {
+		super(theIdHelperService, theMdmLinkDaoSvc, theTargetResources);
 	}
 
 	@Override
@@ -41,7 +41,7 @@ public class IsPossibleLinkedTo extends BaseSourceResourceMatcher {
 	public void describeTo(Description theDescription) {
 	}
 
-	public static Matcher<IAnyResource> possibleLinkedTo(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		return new IsPossibleLinkedTo(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	public static Matcher<IAnyResource> possibleLinkedTo(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		return new IsPossibleLinkedTo(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleMatchWith.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java
similarity index 62%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleMatchWith.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java
index 7783ae84b67..a68cea8958a 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsPossibleMatchWith.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -13,17 +13,17 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
- * Matcher with tells us if there is an EmpiLink with between these two resources that are considered POSSIBLE_MATCH
+ * Matcher with tells us if there is an MdmLink with between these two resources that are considered POSSIBLE_MATCH
  */
 public class IsPossibleMatchWith extends BaseSourceResourceMatcher {
 
-	protected IsPossibleMatchWith(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		super(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	protected IsPossibleMatchWith(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 
 	@Override
 	protected boolean matchesSafely(IAnyResource theIncomingResource) {
-		List<EmpiLink> empiLinks = getEmpiLinksForTarget(theIncomingResource, EmpiMatchResultEnum.POSSIBLE_MATCH);
+		List<MdmLink> mdmLinks = getEmpiLinksForTarget(theIncomingResource, MdmMatchResultEnum.POSSIBLE_MATCH);
 
 		List<Long> personPidsToMatch = myBaseResources.stream()
 			.map(this::getMatchedResourcePidFromResource)
@@ -36,7 +36,7 @@ public class IsPossibleMatchWith extends BaseSourceResourceMatcher {
 				.collect(Collectors.toList());
 		}
 
-		List<Long> empiLinkSourcePersonPids = empiLinks.stream().map(EmpiLink::getSourceResourcePid).collect(Collectors.toList());
+		List<Long> empiLinkSourcePersonPids = mdmLinks.stream().map(MdmLink::getGoldenResourcePid).collect(Collectors.toList());
 		return empiLinkSourcePersonPids.containsAll(personPidsToMatch);
 	}
 
@@ -51,7 +51,7 @@ public class IsPossibleMatchWith extends BaseSourceResourceMatcher {
 		mismatchDescription.appendText("No Empi Link With POSSIBLE_MATCH was found");
 	}
 
-	public static Matcher<IAnyResource> possibleMatchWith(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		return new IsPossibleMatchWith(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	public static Matcher<IAnyResource> possibleMatchWith(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		return new IsPossibleMatchWith(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsSameSourceResourceAs.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java
similarity index 81%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsSameSourceResourceAs.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java
index 8c21ef2da83..ac76162ec55 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/matcher/IsSameSourceResourceAs.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.jpa.empi.matcher;
+package ca.uhn.fhir.jpa.mdm.matcher;
 
 import ca.uhn.fhir.jpa.dao.index.IdHelperService;
-import ca.uhn.fhir.jpa.empi.dao.EmpiLinkDaoSvc;
+import ca.uhn.fhir.jpa.mdm.dao.MdmLinkDaoSvc;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -14,8 +14,8 @@ public class IsSameSourceResourceAs extends BaseSourceResourceMatcher {
 	private List<Long> sourceResourcePidsToMatch;
 	private Long incomingSourceResourcePid;
 
-	public IsSameSourceResourceAs(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		super(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	public IsSameSourceResourceAs(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		super(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 
 	@Override
@@ -40,7 +40,7 @@ public class IsSameSourceResourceAs extends BaseSourceResourceMatcher {
 		mismatchDescription.appendText(String.format(" was actually linked to %s/%s", myTargetType, incomingSourceResourcePid));
 	}
 
-	public static Matcher<IAnyResource> sameSourceResourceAs(IdHelperService theIdHelperService, EmpiLinkDaoSvc theEmpiLinkDaoSvc, IAnyResource... theBaseResource) {
-		return new IsSameSourceResourceAs(theIdHelperService, theEmpiLinkDaoSvc, theBaseResource);
+	public static Matcher<IAnyResource> sameSourceResourceAs(IdHelperService theIdHelperService, MdmLinkDaoSvc theMdmLinkDaoSvc, IAnyResource... theBaseResource) {
+		return new IsSameSourceResourceAs(theIdHelperService, theMdmLinkDaoSvc, theBaseResource);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseLinkR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java
similarity index 71%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseLinkR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java
index 45e383599e7..022a573ea63 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/BaseLinkR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.jpa.api.config.DaoConfig;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.r4.model.Patient;
 import org.hl7.fhir.r4.model.StringType;
@@ -18,17 +18,17 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public abstract class BaseLinkR4Test extends BaseProviderR4Test {
-	protected static final StringType NO_MATCH_RESULT = new StringType(EmpiMatchResultEnum.NO_MATCH.name());
-	protected static final StringType MATCH_RESULT = new StringType(EmpiMatchResultEnum.MATCH.name());
-	protected static final StringType POSSIBLE_MATCH_RESULT = new StringType(EmpiMatchResultEnum.POSSIBLE_MATCH.name());
-	protected static final StringType POSSIBLE_DUPLICATE_RESULT = new StringType(EmpiMatchResultEnum.POSSIBLE_DUPLICATE.name());
+	protected static final StringType NO_MATCH_RESULT = new StringType(MdmMatchResultEnum.NO_MATCH.name());
+	protected static final StringType MATCH_RESULT = new StringType(MdmMatchResultEnum.MATCH.name());
+	protected static final StringType POSSIBLE_MATCH_RESULT = new StringType(MdmMatchResultEnum.POSSIBLE_MATCH.name());
+	protected static final StringType POSSIBLE_DUPLICATE_RESULT = new StringType(MdmMatchResultEnum.POSSIBLE_DUPLICATE.name());
 
 	@Autowired
 	DaoConfig myDaoConfig;
 
 	protected Patient myPatient;
 	protected IAnyResource mySourcePatient;
-	protected EmpiLink myLink;
+	protected MdmLink myLink;
 	protected StringType myPatientId;
 	protected StringType mySourcePatientId;
 	protected StringType myVersionlessGodlenResourceId;
@@ -47,9 +47,9 @@ public abstract class BaseLinkR4Test extends BaseProviderR4Test {
 
 		myLink = getOnlyPatientLink();
 		// Tests require our initial link to be a POSSIBLE_MATCH
-		myLink.setMatchResult(EmpiMatchResultEnum.POSSIBLE_MATCH);
+		myLink.setMatchResult(MdmMatchResultEnum.POSSIBLE_MATCH);
 		saveLink(myLink);
-		assertEquals(EmpiLinkSourceEnum.AUTO, myLink.getLinkSource());
+		assertEquals(MdmLinkSourceEnum.AUTO, myLink.getLinkSource());
 		myDaoConfig.setExpungeEnabled(true);
 	}
 
@@ -60,12 +60,12 @@ public abstract class BaseLinkR4Test extends BaseProviderR4Test {
 	}
 
 	@Nonnull
-	protected EmpiLink getOnlyPatientLink() {
-		return myEmpiLinkDaoSvc.findEmpiLinkByTarget(myPatient).get();
+	protected MdmLink getOnlyPatientLink() {
+		return myMdmLinkDaoSvc.findMdmLinkByTarget(myPatient).get();
 	}
 
 	@Nonnull
-	protected List<EmpiLink> getPatientLinks() {
-		return myEmpiLinkDaoSvc.findEmpiLinksByTarget(myPatient);
+	protected List<MdmLink> getPatientLinks() {
+		return myMdmLinkDaoSvc.findMdmLinksByTarget(myPatient);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java
new file mode 100644
index 00000000000..4418b6d904d
--- /dev/null
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java
@@ -0,0 +1,53 @@
+package ca.uhn.fhir.jpa.mdm.provider;
+
+import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
+import ca.uhn.fhir.mdm.api.IMdmExpungeSvc;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
+import ca.uhn.fhir.mdm.provider.MdmProviderR4;
+import ca.uhn.fhir.mdm.rules.config.MdmSettings;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import com.google.common.base.Charsets;
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+
+public abstract class BaseProviderR4Test extends BaseMdmR4Test {
+	MdmProviderR4 myMdmProviderR4;
+	@Autowired
+	private IMdmMatchFinderSvc myMdmMatchFinderSvc;
+	@Autowired
+	private IMdmControllerSvc myMdmControllerSvc;
+	@Autowired
+	private IMdmExpungeSvc myMdmExpungeSvc;
+	@Autowired
+	private IMdmSubmitSvc myMdmSubmitSvc;
+	@Autowired
+	private MdmSettings myMdmSettings;
+
+	private String defaultScript;
+
+	protected void setEmpiRuleJson(String theString) throws IOException {
+		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
+		Resource resource = resourceLoader.getResource(theString);
+		String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
+		myMdmSettings.setScriptText(json);
+
+	}
+
+	@BeforeEach
+	public void before() {
+		myMdmProviderR4 = new MdmProviderR4(myFhirContext, myMdmControllerSvc, myMdmMatchFinderSvc, myMdmExpungeSvc, myMdmSubmitSvc);
+		defaultScript = myMdmSettings.getScriptText();
+	}
+	@AfterEach
+	public void after() throws IOException {
+		super.after();
+		myMdmSettings.setScriptText(defaultScript);
+	}
+}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderBatchR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java
similarity index 67%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderBatchR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java
index 4e17759e770..6ec35e3b50c 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderBatchR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.interceptor.api.Pointcut;
@@ -23,7 +23,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiProviderBatchR4Test extends BaseLinkR4Test {
+public class MdmProviderBatchR4Test extends BaseLinkR4Test {
 
 	public static final String ORGANIZATION_DUMMY = "Organization/dummy";
 	protected Practitioner myPractitioner;
@@ -38,7 +38,7 @@ public class EmpiProviderBatchR4Test extends BaseLinkR4Test {
 
 	@Autowired
 	IInterceptorService myInterceptorService;
-	PointcutLatch afterEmpiLatch = new PointcutLatch(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED);
+	PointcutLatch afterMdmLatch = new PointcutLatch(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED);
 
 
 	@BeforeEach
@@ -59,44 +59,44 @@ public class EmpiProviderBatchR4Test extends BaseLinkR4Test {
 		myGoldenMedicationId = new StringType(myGoldenMedication.getIdElement().getValue());
 
 
-		myInterceptorService.registerAnonymousInterceptor(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED, afterEmpiLatch);
+		myInterceptorService.registerAnonymousInterceptor(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED, afterMdmLatch);
 	}
 
 	@AfterEach
 	public void after() throws IOException {
-		myInterceptorService.unregisterInterceptor(afterEmpiLatch);
+		myInterceptorService.unregisterInterceptor(afterMdmLatch);
 		super.after();
 	}
 
 	@Test
 	public void testBatchRunOnAllMedications() throws InterruptedException {
 		StringType criteria = null;
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 
-		afterEmpiLatch.runWithExpectedCount(1, () -> myEmpiProviderR4.empiBatchOnAllTargets(new StringType("Medication"), criteria, null));
+		afterMdmLatch.runWithExpectedCount(1, () -> myMdmProviderR4.empiBatchOnAllTargets(new StringType("Medication"), criteria, null));
 		assertLinkCount(1);
 	}
 
 	@Test
 	public void testBatchRunOnAllPractitioners() throws InterruptedException {
 		StringType criteria = null;
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 
-		afterEmpiLatch.runWithExpectedCount(1, () -> myEmpiProviderR4.empiBatchPractitionerType(criteria, null));
+		afterMdmLatch.runWithExpectedCount(1, () -> myMdmProviderR4.empiBatchPractitionerType(criteria, null));
 		assertLinkCount(1);
 	}
 	@Test
 	public void testBatchRunOnSpecificPractitioner() throws InterruptedException {
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
-		afterEmpiLatch.runWithExpectedCount(1, () -> myEmpiProviderR4.empiBatchPractitionerInstance(myPractitioner.getIdElement(), null));
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
+		afterMdmLatch.runWithExpectedCount(1, () -> myMdmProviderR4.empiBatchPractitionerInstance(myPractitioner.getIdElement(), null));
 		assertLinkCount(1);
 	}
 
 	@Test
 	public void testBatchRunOnNonExistentSpecificPractitioner() {
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 		try {
-			myEmpiProviderR4.empiBatchPractitionerInstance(new IdType("Practitioner/999"), null);
+			myMdmProviderR4.empiBatchPractitionerInstance(new IdType("Practitioner/999"), null);
 			fail();
 		} catch (ResourceNotFoundException e){}
 	}
@@ -105,25 +105,25 @@ public class EmpiProviderBatchR4Test extends BaseLinkR4Test {
 	public void testBatchRunOnAllPatients() throws InterruptedException {
 		assertLinkCount(3);
 		StringType criteria = null;
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
-		afterEmpiLatch.runWithExpectedCount(1, () -> myEmpiProviderR4.empiBatchPatientType(criteria, null));
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
+		afterMdmLatch.runWithExpectedCount(1, () -> myMdmProviderR4.empiBatchPatientType(criteria, null));
 		assertLinkCount(1);
 	}
 
 	@Test
 	public void testBatchRunOnSpecificPatient() throws InterruptedException {
 		assertLinkCount(3);
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
-		afterEmpiLatch.runWithExpectedCount(1, () -> myEmpiProviderR4.empiBatchPatientInstance(myPatient.getIdElement(), null));
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
+		afterMdmLatch.runWithExpectedCount(1, () -> myMdmProviderR4.empiBatchPatientInstance(myPatient.getIdElement(), null));
 		assertLinkCount(1);
 	}
 
 	@Test
 	public void testBatchRunOnNonExistentSpecificPatient() {
 		assertLinkCount(3);
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 		try {
-			myEmpiProviderR4.empiBatchPatientInstance(new IdType("Patient/999"), null);
+			myMdmProviderR4.empiBatchPatientInstance(new IdType("Patient/999"), null);
 			fail();
 		} catch (ResourceNotFoundException e){}
 	}
@@ -132,9 +132,9 @@ public class EmpiProviderBatchR4Test extends BaseLinkR4Test {
 	public void testBatchRunOnAllTypes() throws InterruptedException {
 		assertLinkCount(3);
 		StringType criteria = new StringType("");
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
-		afterEmpiLatch.runWithExpectedCount(3, () -> {
-			myEmpiProviderR4.empiBatchOnAllTargets(null, criteria, null);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
+		afterMdmLatch.runWithExpectedCount(3, () -> {
+			myMdmProviderR4.empiBatchOnAllTargets(null, criteria, null);
 		});
 		assertLinkCount(3);
 	}
@@ -143,10 +143,10 @@ public class EmpiProviderBatchR4Test extends BaseLinkR4Test {
 	public void testBatchRunOnAllTypesWithInvalidCriteria() {
 		assertLinkCount(3);
 		StringType criteria = new StringType("death-date=2020-06-01");
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 
 		try {
-			myEmpiProviderR4.empiBatchPractitionerType(criteria, null);
+			myMdmProviderR4.empiBatchPractitionerType(criteria, null);
 			fail();
 		} catch(InvalidRequestException e) {
 			assertThat(e.getMessage(), is(equalTo("Failed to parse match URL[death-date=2020-06-01] - Resource type Practitioner does not have a parameter with name: death-date")));
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java
similarity index 83%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java
index e3e279928db..7bae41b46f1 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
 import javax.annotation.Nonnull;
 import java.util.List;
 
-import static ca.uhn.fhir.empi.api.EmpiMatchOutcome.POSSIBLE_MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchOutcome.POSSIBLE_MATCH;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
@@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
+public class MdmProviderClearLinkR4Test extends BaseLinkR4Test {
 	protected Practitioner myPractitioner;
 	protected StringType myPractitionerId;
 	protected IAnyResource myPractitionerSourceResource;
@@ -47,7 +47,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testClearAllLinks() {
 		assertLinkCount(2);
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 		assertNoLinksExist();
 	}
 
@@ -69,7 +69,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 		assertLinkCount(2);
 		Patient read = myPatientDao.read(new IdDt(mySourcePatientId.getValueAsString()).toVersionless());
 		assertThat(read, is(notNullValue()));
-		myEmpiProviderR4.clearEmpiLinks(new StringType("Patient"), myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(new StringType("Patient"), myRequestDetails);
 		assertNoPatientLinksExist();
 		try {
 			myPatientDao.read(new IdDt(mySourcePatientId.getValueAsString()).toVersionless());
@@ -86,7 +86,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 		Patient patientAndUpdateLinks = createPatientAndUpdateLinks(buildJanePatient());
 		IAnyResource person = getGoldenResourceFromTargetResource(patientAndUpdateLinks);
 		assertThat(person, is(notNullValue()));
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 		assertNoPatientLinksExist();
 		person = getGoldenResourceFromTargetResource(patientAndUpdateLinks);
 		assertThat(person, is(nullValue()));
@@ -103,7 +103,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 		linkPersons(personFromTarget, personFromTarget2);
 
 		//SUT
-		myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 
 		assertNoPatientLinksExist();
 		IBundleProvider search = myPatientDao.search(buildSourceResourceParameterMap());
@@ -115,7 +115,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 	 * @return
 	 */
 	private SearchParameterMap buildSourceResourceParameterMap() {
-		return new SearchParameterMap().setLoadSynchronous(true).add("_tag", new TokenParam(EmpiConstants.SYSTEM_MDM_MANAGED, EmpiConstants.CODE_HAPI_MDM_MANAGED));
+		return new SearchParameterMap().setLoadSynchronous(true).add("_tag", new TokenParam(MdmConstants.SYSTEM_MDM_MANAGED, MdmConstants.CODE_HAPI_MDM_MANAGED));
 	}
 
 	@Test
@@ -134,7 +134,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 		linkPersons(personFromTarget2, personFromTarget);
 
 		//SUT
-		Parameters parameters = myEmpiProviderR4.clearEmpiLinks(null, myRequestDetails);
+		Parameters parameters = myMdmProviderR4.clearMdmLinks(null, myRequestDetails);
 
 		printLinks();
 
@@ -148,7 +148,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 	private void linkPersons(IAnyResource theGoldenResource, IAnyResource theTargetResource) {
 		// TODO NG - Should be ok to leave this - not really
 		// throw new UnsupportedOperationException("We need to fix this!");
-		myEmpiLinkDaoSvc.createOrUpdateLinkEntity(theGoldenResource, theTargetResource, POSSIBLE_MATCH, EmpiLinkSourceEnum.AUTO, createContextForCreate("Patient"));
+		myMdmLinkDaoSvc.createOrUpdateLinkEntity(theGoldenResource, theTargetResource, POSSIBLE_MATCH, MdmLinkSourceEnum.AUTO, createContextForCreate("Patient"));
 	}
 
 	@Test
@@ -156,7 +156,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 		assertLinkCount(2);
 		Practitioner read = myPractitionerDao.read(new IdDt(myPractitionerSourceResourceId.getValueAsString()).toVersionless());
 		assertThat(read, is(notNullValue()));
-		myEmpiProviderR4.clearEmpiLinks(new StringType("Practitioner"), myRequestDetails);
+		myMdmProviderR4.clearMdmLinks(new StringType("Practitioner"), myRequestDetails);
 		assertNoPractitionerLinksExist();
 		try {
 			myPractitionerDao.read(new IdDt(myPractitionerSourceResourceId.getValueAsString()).toVersionless());
@@ -167,7 +167,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testClearInvalidTargetType() {
 		try {
-			myEmpiProviderR4.clearEmpiLinks(new StringType("Observation"), myRequestDetails);
+			myMdmProviderR4.clearMdmLinks(new StringType("Observation"), myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertThat(e.getMessage(), is(equalTo("$mdm-clear does not support resource type: Observation")));
@@ -175,7 +175,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 	}
 
 	@Nonnull
-	protected List<EmpiLink> getPractitionerLinks() {
-		return myEmpiLinkDaoSvc.findEmpiLinksByTarget(myPractitioner);
+	protected List<MdmLink> getPractitionerLinks() {
+		return myMdmLinkDaoSvc.findMdmLinksByTarget(myPractitioner);
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderMatchR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java
similarity index 84%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderMatchR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java
index beb3065d082..be4fa0ab0ec 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderMatchR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java
@@ -1,11 +1,10 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
+import ca.uhn.fhir.mdm.api.MdmConstants;
 import com.google.common.collect.Ordering;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Extension;
 import org.hl7.fhir.r4.model.Medication;
-import org.hl7.fhir.r4.model.Organization;
 import org.hl7.fhir.r4.model.Patient;
 import org.hl7.fhir.r4.model.StringType;
 import org.hl7.fhir.r4.model.codesystems.MatchGrade;
@@ -21,9 +20,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
+public class MdmProviderMatchR4Test extends BaseProviderR4Test {
 
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiProviderMatchR4Test.class);
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmProviderMatchR4Test.class);
 
 	public static final String NAME_GIVEN_JANET = NAME_GIVEN_JANE + "t";
 
@@ -31,7 +30,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 	@BeforeEach
 	public void before() {
 		super.before();
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 	}
 
 	@Test
@@ -41,7 +40,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		Patient createdJane = createPatient(jane);
 		Patient newJane = buildJanePatient();
 
-		Bundle result = myEmpiProviderR4.match(newJane);
+		Bundle result = myMdmProviderR4.match(newJane);
 		assertEquals(1, result.getEntry().size());
 
 		Bundle.BundleEntryComponent entry0 = result.getEntry().get(0);
@@ -51,7 +50,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		assertEquals(Bundle.SearchEntryMode.MATCH, searchComponent.getMode());
 
 		assertEquals(2.0 / 3.0, searchComponent.getScore().doubleValue(), 0.01);
-		Extension matchGradeExtension = searchComponent.getExtensionByUrl(EmpiConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE);
+		Extension matchGradeExtension = searchComponent.getExtensionByUrl(MdmConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE);
 		assertNotNull(matchGradeExtension);
 		assertEquals(MatchGrade.CERTAIN.toCode(), matchGradeExtension.getValue().toString());
 	}
@@ -65,7 +64,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		Medication createdMedication = createMedication(medication);
 		Medication newMedication = buildMedication("Organization/mfr");
 
-		Bundle result = myEmpiProviderR4.serverMatch(newMedication, new StringType("Medication"));
+		Bundle result = myMdmProviderR4.serverMatch(newMedication, new StringType("Medication"));
 		assertEquals(1, result.getEntry().size());
 
 		Bundle.BundleEntryComponent entry0 = result.getEntry().get(0);
@@ -76,7 +75,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 
 		//Since there is only
 		assertEquals(1.0 / 1.0, searchComponent.getScore().doubleValue(), 0.01);
-		Extension matchGradeExtension = searchComponent.getExtensionByUrl(EmpiConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE);
+		Extension matchGradeExtension = searchComponent.getExtensionByUrl(MdmConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE);
 		assertNotNull(matchGradeExtension);
 		assertEquals(MatchGrade.CERTAIN.toCode(), matchGradeExtension.getValue().toString());
 
@@ -90,7 +89,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		Patient createdJane = createPatient(jane);
 		Patient newJane = buildJanePatient();
 
-		Bundle result = myEmpiProviderR4.serverMatch(newJane, new StringType("Patient"));
+		Bundle result = myMdmProviderR4.serverMatch(newJane, new StringType("Patient"));
 		assertEquals(1, result.getEntry().size());
 
 		Bundle.BundleEntryComponent entry0 = result.getEntry().get(0);
@@ -100,7 +99,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		assertEquals(Bundle.SearchEntryMode.MATCH, searchComponent.getMode());
 
 		assertEquals(2.0 / 3.0, searchComponent.getScore().doubleValue(), 0.01);
-		Extension matchGradeExtension = searchComponent.getExtensionByUrl(EmpiConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE);
+		Extension matchGradeExtension = searchComponent.getExtensionByUrl(MdmConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE);
 		assertNotNull(matchGradeExtension);
 		assertEquals(MatchGrade.CERTAIN.toCode(), matchGradeExtension.getValue().toString());
 	}
@@ -116,7 +115,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 
 		Patient newJane = buildJanePatient();
 
-		Bundle result = myEmpiProviderR4.match(newJane);
+		Bundle result = myMdmProviderR4.match(newJane);
 		assertEquals(2, result.getEntry().size());
 
 		Bundle.BundleEntryComponent entry0 = result.getEntry().get(0);
@@ -140,7 +139,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		Patient paul = buildPaulPatient();
 		paul.setActive(true);
 
-		Bundle result = myEmpiProviderR4.match(paul);
+		Bundle result = myMdmProviderR4.match(paul);
 		assertEquals(0, result.getEntry().size());
 	}
 
@@ -152,7 +151,7 @@ public class EmpiProviderMatchR4Test extends BaseProviderR4Test {
 		Patient createdJane = createPatient(jane);
 		Patient newJane = buildJanePatient();
 
-		Bundle result = myEmpiProviderR4.match(newJane);
+		Bundle result = myMdmProviderR4.match(newJane);
 		assertEquals(1, result.getEntry().size());
 		assertEquals(createdJane.getId(), result.getEntryFirstRep().getResource().getId());
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderMergePersonsR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java
similarity index 75%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderMergePersonsR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java
index bb9b92217c3..97aee626373 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderMergePersonsR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java
@@ -1,22 +1,17 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.util.AssuranceLevelUtil;
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
-import org.hl7.fhir.instance.model.api.IAnyResource;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Patient;
 import org.hl7.fhir.r4.model.StringType;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
-import java.util.Optional;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -24,7 +19,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
+public class MdmProviderMergePersonsR4Test extends BaseProviderR4Test {
 
 	private Patient myFromSourcePatient;
 	private StringType myFromSourcePatientId;
@@ -35,7 +30,7 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
 	@BeforeEach
 	public void before() {
 		super.before();
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 
 		myFromSourcePatient = createGoldenPatient();
 		myFromSourcePatientId = new StringType(myFromSourcePatient.getIdElement().getValue());
@@ -45,10 +40,10 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
 
 	@Test
 	public void testMerge() {
-		Patient mergedSourcePatient = (Patient) myEmpiProviderR4.mergeGoldenResources(myFromSourcePatientId,
+		Patient mergedSourcePatient = (Patient) myMdmProviderR4.mergeGoldenResources(myFromSourcePatientId,
 			myToSourcePatientId, myRequestDetails);
 
-		assertTrue(EmpiUtil.isGoldenRecord(myFromSourcePatient));
+		assertTrue(MdmUtil.isGoldenRecord(myFromSourcePatient));
 		assertEquals(myToSourcePatient.getIdElement(), mergedSourcePatient.getIdElement());
 		assertThat(mergedSourcePatient, is(sameSourceResourceAs(myToSourcePatient)));
 		assertEquals(1, getAllRedirectedGoldenPatients().size());
@@ -56,20 +51,20 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
 
 		Patient fromSourcePatient = myPatientDao.read(myFromSourcePatient.getIdElement().toUnqualifiedVersionless());
 		assertThat(fromSourcePatient.getActive(), is(false));
-		assertTrue(EmpiUtil.isGoldenRecordRedirected(fromSourcePatient));
+		assertTrue(MdmUtil.isGoldenRecordRedirected(fromSourcePatient));
 
 		//TODO GGG eventually this will need to check a redirect... this is a hack which doesnt work
 		// Optional<Identifier> redirect = fromSourcePatient.getIdentifier().stream().filter(theIdentifier -> theIdentifier.getSystem().equals("REDIRECT")).findFirst();
 		// assertThat(redirect.get().getValue(), is(equalTo(myToSourcePatient.getIdElement().toUnqualified().getValue())));
 
-		List<EmpiLink> links = myEmpiLinkDaoSvc.findEmpiLinksByTarget(myFromSourcePatient);
+		List<MdmLink> links = myMdmLinkDaoSvc.findMdmLinksByTarget(myFromSourcePatient);
 		assertThat(links, hasSize(1));
 
-		EmpiLink link = links.get(0);
+		MdmLink link = links.get(0);
 		assertEquals(link.getTargetPid(), myFromSourcePatient.getIdElement().toUnqualifiedVersionless().getIdPartAsLong());
-		assertEquals(link.getSourceResourcePid(), myToSourcePatient.getIdElement().toUnqualifiedVersionless().getIdPartAsLong());
-		assertEquals(link.getMatchResult(), EmpiMatchResultEnum.REDIRECT);
-		assertEquals(link.getLinkSource(), EmpiLinkSourceEnum.MANUAL);
+		assertEquals(link.getGoldenResourcePid(), myToSourcePatient.getIdElement().toUnqualifiedVersionless().getIdPartAsLong());
+		assertEquals(link.getMatchResult(), MdmMatchResultEnum.REDIRECT);
+		assertEquals(link.getLinkSource(), MdmLinkSourceEnum.MANUAL);
 		// assertThat(links.get(0).getAssurance(), is (AssuranceLevelUtil.getAssuranceLevel(EmpiMatchResultEnum.REDIRECT, EmpiLinkSourceEnum.MANUAL).toR4()));
 		//List<Person.PersonLinkComponent> links = fromSourcePatient.getLink();
 		//assertThat(links, hasSize(1));
@@ -82,7 +77,7 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
 		StringType fromPersonId = new StringType(createPatient().getIdElement().getValue());
 		StringType toPersonId = new StringType(createPatient().getIdElement().getValue());
 		try {
-			myEmpiProviderR4.mergeGoldenResources(fromPersonId, toPersonId, myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(fromPersonId, toPersonId, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("Only MDM managed resources can be merged. MDM managed resources must have the HAPI-MDM tag.", e.getMessage());
@@ -106,19 +101,19 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
 	@Test
 	public void testNullParams() {
 		try {
-			myEmpiProviderR4.mergeGoldenResources(null, null, myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(null, null, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("fromGoldenResourceId cannot be null", e.getMessage());
 		}
 		try {
-			myEmpiProviderR4.mergeGoldenResources(null, myToSourcePatientId, myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(null, myToSourcePatientId, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("fromGoldenResourceId cannot be null", e.getMessage());
 		}
 		try {
-			myEmpiProviderR4.mergeGoldenResources(myFromSourcePatientId, null, myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(myFromSourcePatientId, null, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("toGoldenResourceId cannot be null", e.getMessage());
@@ -146,21 +141,21 @@ public class EmpiProviderMergePersonsR4Test extends BaseProviderR4Test {
 //		}
 
 		try {
-			myEmpiProviderR4.mergeGoldenResources(new StringType("Person/1"), new StringType("Person/1"), myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(new StringType("Person/1"), new StringType("Person/1"), myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("fromPersonId must be different from toPersonId", e.getMessage());
 		}
 
 		try {
-			myEmpiProviderR4.mergeGoldenResources(new StringType("Person/abc"), myToSourcePatientId, myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(new StringType("Person/abc"), myToSourcePatientId, myRequestDetails);
 			fail();
 		} catch (ResourceNotFoundException e) {
 			assertEquals("Resource Person/abc is not known", e.getMessage());
 		}
 
 		try {
-			myEmpiProviderR4.mergeGoldenResources(myFromSourcePatientId, new StringType("Person/abc"), myRequestDetails);
+			myMdmProviderR4.mergeGoldenResources(myFromSourcePatientId, new StringType("Person/abc"), myRequestDetails);
 			fail();
 		} catch (ResourceNotFoundException e) {
 			assertEquals("Resource Person/abc is not known", e.getMessage());
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderQueryLinkR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java
similarity index 70%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderQueryLinkR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java
index 8da3c32cd91..3bcb73cdbf8 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderQueryLinkR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -26,8 +26,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiProviderQueryLinkR4Test extends BaseLinkR4Test {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiProviderQueryLinkR4Test.class);
+public class MdmProviderQueryLinkR4Test extends BaseLinkR4Test {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmProviderQueryLinkR4Test.class);
 	private StringType myLinkSource;
 	private StringType myPerson1Id;
 	private StringType myPerson2Id;
@@ -41,7 +41,7 @@ public class EmpiProviderQueryLinkR4Test extends BaseLinkR4Test {
 		createPatientAndUpdateLinks(buildJanePatient());
 
 		// Add a possible duplicate
-		myLinkSource = new StringType(EmpiLinkSourceEnum.AUTO.name());
+		myLinkSource = new StringType(MdmLinkSourceEnum.AUTO.name());
 		Patient sourcePatient1 = createGoldenPatient();
 		myPerson1Id = new StringType(sourcePatient1.getIdElement().toVersionless().getValue());
 		Long sourcePatient1Pid = myIdHelperService.getPidOrNull(sourcePatient1);
@@ -49,19 +49,19 @@ public class EmpiProviderQueryLinkR4Test extends BaseLinkR4Test {
 		myPerson2Id = new StringType(sourcePatient2.getIdElement().toVersionless().getValue());
 		Long sourcePatient2Pid = myIdHelperService.getPidOrNull(sourcePatient2);
 
-		EmpiLink possibleDuplicateEmpiLink = myEmpiLinkDaoSvc.newEmpiLink().setGoldenResourcePid(sourcePatient1Pid).setTargetPid(sourcePatient2Pid).setMatchResult(EmpiMatchResultEnum.POSSIBLE_DUPLICATE).setLinkSource(EmpiLinkSourceEnum.AUTO);
-		saveLink(possibleDuplicateEmpiLink);
+		MdmLink possibleDuplicateMdmLink = myMdmLinkDaoSvc.newMdmLink().setGoldenResourcePid(sourcePatient1Pid).setTargetPid(sourcePatient2Pid).setMatchResult(MdmMatchResultEnum.POSSIBLE_DUPLICATE).setLinkSource(MdmLinkSourceEnum.AUTO);
+		saveLink(possibleDuplicateMdmLink);
 	}
 
 	@Test
 	public void testQueryLinkOneMatch() {
 
-		Parameters result = myEmpiProviderR4.queryLinks(mySourcePatientId, myPatientId, null, null, myRequestDetails);
+		Parameters result = myMdmProviderR4.queryLinks(mySourcePatientId, myPatientId, null, null, myRequestDetails);
 		ourLog.info(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(result));
 		List<Parameters.ParametersParameterComponent> list = result.getParameter();
 		assertThat(list, hasSize(1));
 		List<Parameters.ParametersParameterComponent> part = list.get(0).getPart();
-		assertEmpiLink(7, part, mySourcePatientId.getValue(), myPatientId.getValue(), EmpiMatchResultEnum.POSSIBLE_MATCH, "false", "true", null);
+		assertMdmLink(7, part, mySourcePatientId.getValue(), myPatientId.getValue(), MdmMatchResultEnum.POSSIBLE_MATCH, "false", "true", null);
 	}
 
 	@Test
@@ -72,38 +72,38 @@ public class EmpiProviderQueryLinkR4Test extends BaseLinkR4Test {
 		IAnyResource person = getGoldenResourceFromTargetResource(patient);
 		IIdType personId = person.getIdElement().toVersionless();
 
-		Parameters result = myEmpiProviderR4.queryLinks(null, null, null, myLinkSource, myRequestDetails);
+		Parameters result = myMdmProviderR4.queryLinks(null, null, null, myLinkSource, myRequestDetails);
 		ourLog.info(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(result));
 		List<Parameters.ParametersParameterComponent> list = result.getParameter();
 		assertThat(list, hasSize(3));
 		List<Parameters.ParametersParameterComponent> part = list.get(2).getPart();
-		assertEmpiLink(7, part, personId.getValue(), patientId.getValue(), EmpiMatchResultEnum.MATCH, "false", "false", "2");
+		assertMdmLink(7, part, personId.getValue(), patientId.getValue(), MdmMatchResultEnum.MATCH, "false", "false", "2");
 	}
 
 	@Test
 	public void testQueryPossibleDuplicates() {
-		Parameters result = myEmpiProviderR4.getDuplicateGoldenResources(myRequestDetails);
+		Parameters result = myMdmProviderR4.getDuplicateGoldenResources(myRequestDetails);
 		ourLog.info(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(result));
 		List<Parameters.ParametersParameterComponent> list = result.getParameter();
 		assertThat(list, hasSize(1));
 		List<Parameters.ParametersParameterComponent> part = list.get(0).getPart();
-		assertEmpiLink(2, part, myPerson1Id.getValue(), myPerson2Id.getValue(), EmpiMatchResultEnum.POSSIBLE_DUPLICATE, "false", "false", null);
+		assertMdmLink(2, part, myPerson1Id.getValue(), myPerson2Id.getValue(), MdmMatchResultEnum.POSSIBLE_DUPLICATE, "false", "false", null);
 	}
 
 	@Test
 	public void testNotDuplicate() {
 		{
-			Parameters result = myEmpiProviderR4.getDuplicateGoldenResources(myRequestDetails);
+			Parameters result = myMdmProviderR4.getDuplicateGoldenResources(myRequestDetails);
 			List<Parameters.ParametersParameterComponent> list = result.getParameter();
 			assertThat(list, hasSize(1));
 		}
 		{
-			Parameters result = myEmpiProviderR4.notDuplicate(myPerson1Id, myPerson2Id, myRequestDetails);
+			Parameters result = myMdmProviderR4.notDuplicate(myPerson1Id, myPerson2Id, myRequestDetails);
 			ourLog.info(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(result));
 			assertEquals("success", result.getParameterFirstRep().getName());
 			assertTrue(((BooleanType) (result.getParameterFirstRep().getValue())).booleanValue());
 		}
-		Parameters result = myEmpiProviderR4.getDuplicateGoldenResources(myRequestDetails);
+		Parameters result = myMdmProviderR4.getDuplicateGoldenResources(myRequestDetails);
 		List<Parameters.ParametersParameterComponent> list = result.getParameter();
 		assertThat(list, hasSize(0));
 	}
@@ -111,14 +111,14 @@ public class EmpiProviderQueryLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testNotDuplicateBadId() {
 		try {
-			myEmpiProviderR4.notDuplicate(myPerson1Id, new StringType("Person/notAnId123"), myRequestDetails);
+			myMdmProviderR4.notDuplicate(myPerson1Id, new StringType("Person/notAnId123"), myRequestDetails);
 			fail();
 		} catch (ResourceNotFoundException e) {
 			assertEquals("Resource Person/notAnId123 is not known", e.getMessage());
 		}
 	}
 
-	private void assertEmpiLink(int theExpectedSize, List<Parameters.ParametersParameterComponent> thePart, String thePersonId, String theTargetId, EmpiMatchResultEnum theMatchResult, String theEidMatch, String theNewPerson, String theScore) {
+	private void assertMdmLink(int theExpectedSize, List<Parameters.ParametersParameterComponent> thePart, String thePersonId, String theTargetId, MdmMatchResultEnum theMatchResult, String theEidMatch, String theNewPerson, String theScore) {
 		assertThat(thePart, hasSize(theExpectedSize));
 		assertThat(thePart.get(0).getName(), is("goldenResourceId"));
 		assertThat(thePart.get(0).getValue().toString(), is(removeVersion(thePersonId)));
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderUpdateLinkR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java
similarity index 57%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderUpdateLinkR4Test.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java
index 51181bd3b32..d321438186f 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderUpdateLinkR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java
@@ -1,10 +1,10 @@
-package ca.uhn.fhir.jpa.empi.provider;
+package ca.uhn.fhir.jpa.mdm.provider;
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.util.MessageHelper;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.util.MessageHelper;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException;
 import org.hl7.fhir.r4.model.Patient;
@@ -18,7 +18,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
+public class MdmProviderUpdateLinkR4Test extends BaseLinkR4Test {
 
 	@Autowired
 	private MessageHelper myMessageHelper;
@@ -26,36 +26,36 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testUpdateLinkNoMatch() {
 		assertLinkCount(1);
-		myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
+		myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
 		assertLinkCount(2);
 
-		List<EmpiLink> links = getPatientLinks();
-		assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
-		assertEquals(EmpiMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
-		assertEquals(EmpiLinkSourceEnum.AUTO, links.get(1).getLinkSource());
-		assertEquals(EmpiMatchResultEnum.MATCH, links.get(1).getMatchResult());
-		assertNotEquals(links.get(0).getSourceResourcePid(), links.get(1).getSourceResourcePid());
+		List<MdmLink> links = getPatientLinks();
+		assertEquals(MdmLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
+		assertEquals(MdmMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
+		assertEquals(MdmLinkSourceEnum.AUTO, links.get(1).getLinkSource());
+		assertEquals(MdmMatchResultEnum.MATCH, links.get(1).getMatchResult());
+		assertNotEquals(links.get(0).getGoldenResourcePid(), links.get(1).getGoldenResourcePid());
 	}
 
 	@Test
 	public void testUpdateLinkMatch() {
 		assertLinkCount(1);
-		myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
+		myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
 		assertLinkCount(1);
 
-		List<EmpiLink> links = getPatientLinks();
-		assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
-		assertEquals(EmpiMatchResultEnum.MATCH, links.get(0).getMatchResult());
+		List<MdmLink> links = getPatientLinks();
+		assertEquals(MdmLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
+		assertEquals(MdmMatchResultEnum.MATCH, links.get(0).getMatchResult());
 	}
 
 	@Test
 	public void testUpdateLinkTwiceFailsDueToWrongVersion() {
-		myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
+		myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
 
 		materiallyChangeGoldenPatient();
 
 		try {
-			myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (ResourceVersionConflictException e) {
 			assertThat(e.getMessage(), matchesPattern("Requested resource Patient/\\d+/_history/1 is not the latest version.  Latest version is Patient/\\d+/_history/2"));
@@ -70,19 +70,19 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 
 	@Test
 	public void testUpdateLinkTwiceDoesNotThrowValidationErrorWhenNoVersionIsProvided() {
-		myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
-		Patient patient = (Patient) myEmpiProviderR4.updateLink(myVersionlessGodlenResourceId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
+		myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
+		Patient patient = (Patient) myMdmProviderR4.updateLink(myVersionlessGodlenResourceId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
 		assertNotNull(patient); // if this wasn't allowed - a validation exception would be thrown
 	}
 
 	@Test
 	public void testUnlinkLink() {
-		myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
+		myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, NO_MATCH_RESULT, myRequestDetails);
 
 		materiallyChangeGoldenPatient();
 
 		try {
-			myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (ResourceVersionConflictException e) {
 			assertThat(e.getMessage(), matchesPattern("Requested resource Patient/\\d+/_history/1 is not the latest version.  Latest version is Patient/\\d+/_history/2"));
@@ -92,7 +92,7 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testUpdateIllegalResultForPossibleMatch() {
 		try {
-			myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, POSSIBLE_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, POSSIBLE_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("$mdm-update-link illegal matchResult value 'POSSIBLE_MATCH'.  Must be NO_MATCH or MATCH", e.getMessage());
@@ -102,7 +102,7 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testUpdateIllegalResultPD() {
 		try {
-			myEmpiProviderR4.updateLink(mySourcePatientId, myPatientId, POSSIBLE_DUPLICATE_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(mySourcePatientId, myPatientId, POSSIBLE_DUPLICATE_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertEquals("$mdm-update-link illegal matchResult value 'POSSIBLE_DUPLICATE'.  Must be NO_MATCH or MATCH", e.getMessage());
@@ -112,7 +112,7 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testUpdateIllegalSecondArg() {
 		try {
-			myEmpiProviderR4.updateLink(myPatientId, new StringType(""), NO_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(myPatientId, new StringType(""), NO_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertThat(e.getMessage(), endsWith(" must have form <resourceType>/<id>  where <id> is the id of the resource and <resourceType> is the type of the resource"));
@@ -122,7 +122,7 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testUpdateIllegalFirstArg() {
 		try {
-			myEmpiProviderR4.updateLink(new StringType(""), myPatientId, NO_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(new StringType(""), myPatientId, NO_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertThat(e.getMessage(), endsWith(" must have form <resourceType>/<id> where <id> is the id of the resource"));
@@ -132,7 +132,7 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testAttemptingToModifyANonExistentLinkFails() {
 		try {
-			myEmpiProviderR4.updateLink(mySourcePatientId, mySourcePatientId, NO_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(mySourcePatientId, mySourcePatientId, NO_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			assertThat(e.getMessage(), startsWith("No link"));
@@ -143,7 +143,7 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	public void testUpdateStrangePerson() {
 		Patient person = createPatient();
 		try {
-			myEmpiProviderR4.updateLink(new StringType(person.getIdElement().getValue()), myPatientId, NO_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(new StringType(person.getIdElement().getValue()), myPatientId, NO_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
 			String expectedMessage = myMessageHelper.getMessageForUnmanagedResource();
@@ -154,13 +154,13 @@ public class EmpiProviderUpdateLinkR4Test extends BaseLinkR4Test {
 	@Test
 	public void testExcludedPerson() {
 		Patient patient = new Patient();
-		patient.getMeta().addTag().setSystem(EmpiConstants.SYSTEM_MDM_MANAGED).setCode(EmpiConstants.CODE_NO_EMPI_MANAGED);
+		patient.getMeta().addTag().setSystem(MdmConstants.SYSTEM_MDM_MANAGED).setCode(MdmConstants.CODE_NO_MDM_MANAGED);
 		createPatient(patient);
 		try {
-			myEmpiProviderR4.updateLink(mySourcePatientId, new StringType(patient.getIdElement().getValue()), NO_MATCH_RESULT, myRequestDetails);
+			myMdmProviderR4.updateLink(mySourcePatientId, new StringType(patient.getIdElement().getValue()), NO_MATCH_RESULT, myRequestDetails);
 			fail();
 		} catch (InvalidRequestException e) {
-			assertEquals("The target is marked with the " + EmpiConstants.CODE_NO_EMPI_MANAGED + " tag which means it may not be EMPI linked.", e.getMessage());
+			assertEquals("The target is marked with the " + MdmConstants.CODE_NO_MDM_MANAGED + " tag which means it may not be EMPI linked.", e.getMessage());
 		}
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/searchparam/SearchParameterTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java
similarity index 90%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/searchparam/SearchParameterTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java
index adfdf68ce41..f3f8b00f8f5 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/searchparam/SearchParameterTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java
@@ -1,16 +1,16 @@
-package ca.uhn.fhir.jpa.empi.searchparam;
+package ca.uhn.fhir.jpa.mdm.searchparam;
 
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
 import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SearchParameterTest extends BaseEmpiR4Test {
+public class SearchParameterTest extends BaseMdmR4Test {
 	private static final Logger ourLog = LoggerFactory.getLogger(SearchParameterTest.class);
 
 	@BeforeEach
 	public void before() {
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 	}
 
 	/**
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkUpdaterSvcImplTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java
similarity index 50%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkUpdaterSvcImplTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java
index 3e812f48de4..b2a35409553 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkUpdaterSvcImplTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java
@@ -1,10 +1,10 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.jpa.empi.provider.EmpiProviderUpdateLinkR4Test;
+import ca.uhn.fhir.jpa.mdm.provider.MdmProviderUpdateLinkR4Test;
 
 /**
  * Tests for this service are in the test for the provider that wraps this service:
- * @see EmpiProviderUpdateLinkR4Test
+ * @see MdmProviderUpdateLinkR4Test
  */
 public class EmpiLinkUpdaterSvcImplTest {
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiBatchSvcImplTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java
similarity index 55%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiBatchSvcImplTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java
index c32a021d680..0aac0e67d00 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiBatchSvcImplTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.interceptor.api.Pointcut;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
 import ca.uhn.test.concurrency.PointcutLatch;
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.jupiter.api.AfterEach;
@@ -14,29 +14,29 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.io.IOException;
 import java.util.Date;
 
-class EmpiBatchSvcImplTest extends BaseEmpiR4Test {
+class MdmBatchSvcImplTest extends BaseMdmR4Test {
 
 	@Autowired
-    IEmpiSubmitSvc myEmpiSubmitSvc;
+	IMdmSubmitSvc myMdmSubmitSvc;
 
 	@Autowired
 	IInterceptorService myInterceptorService;
 
-	PointcutLatch afterEmpiLatch = new PointcutLatch(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED);
+	PointcutLatch afterMdmLatch = new PointcutLatch(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED);
 
 	@BeforeEach
 	public void before() {
-		myInterceptorService.registerAnonymousInterceptor(Pointcut.EMPI_AFTER_PERSISTED_RESOURCE_CHECKED, afterEmpiLatch);
+		myInterceptorService.registerAnonymousInterceptor(Pointcut.MDM_AFTER_PERSISTED_RESOURCE_CHECKED, afterMdmLatch);
 	}
 	@AfterEach
 	public void after() throws IOException {
-		myInterceptorService.unregisterInterceptor(afterEmpiLatch);
-		afterEmpiLatch.clear();
+		myInterceptorService.unregisterInterceptor(afterMdmLatch);
+		afterMdmLatch.clear();
 		super.after();
 	}
 
 	@Test
-	public void testEmpiBatchRunWorksOverMultipleTargetTypes() throws InterruptedException {
+	public void testMdmBatchRunWorksOverMultipleTargetTypes() throws InterruptedException {
 
 		for (int i =0; i < 10; i++) {
 			createPatient(buildJanePatient());
@@ -54,13 +54,13 @@ class EmpiBatchSvcImplTest extends BaseEmpiR4Test {
 		assertLinkCount(0);
 
 		//SUT
-		afterEmpiLatch.runWithExpectedCount(30, () -> myEmpiSubmitSvc.submitAllTargetTypesToEmpi(null));
+		afterMdmLatch.runWithExpectedCount(30, () -> myMdmSubmitSvc.submitAllTargetTypesToMdm(null));
 
 		assertLinkCount(30);
 	}
 
 	@Test
-	public void testEmpiBatchOnPatientType() throws Exception {
+	public void testMdmBatchOnPatientType() throws Exception {
 
 		for (int i =0; i < 10; i++) {
 			createPatient(buildPatientWithNameAndId("test", "id"));
@@ -69,13 +69,13 @@ class EmpiBatchSvcImplTest extends BaseEmpiR4Test {
 		assertLinkCount(0);
 
 		//SUT
-		afterEmpiLatch.runWithExpectedCount(10, () -> myEmpiSubmitSvc.submitTargetTypeToEmpi("Patient", null));
+		afterMdmLatch.runWithExpectedCount(10, () -> myMdmSubmitSvc.submitTargetTypeToMdm("Patient", null));
 
 		assertLinkCount(10);
 	}
 
 	@Test
-	public void testEmpiBatchOnMedicationType() throws Exception {
+	public void testMdmBatchOnMedicationType() throws Exception {
 
 		createDummyOrganization();
 
@@ -86,13 +86,13 @@ class EmpiBatchSvcImplTest extends BaseEmpiR4Test {
 		assertLinkCount(0);
 
 		//SUT
-		afterEmpiLatch.runWithExpectedCount(10, () -> myEmpiSubmitSvc.submitTargetTypeToEmpi("Medication", null));
+		afterMdmLatch.runWithExpectedCount(10, () -> myMdmSubmitSvc.submitTargetTypeToMdm("Medication", null));
 
 		assertLinkCount(10);
 	}
 
 	@Test
-	public void testEmpiBatchOnPractitionerType() throws Exception {
+	public void testMdmBatchOnPractitionerType() throws Exception {
 
 		for (int i =0; i < 10; i++) {
 			createPractitioner(buildPractitionerWithNameAndId("test", "id"));
@@ -101,20 +101,20 @@ class EmpiBatchSvcImplTest extends BaseEmpiR4Test {
 		assertLinkCount(0);
 
 		//SUT
-		afterEmpiLatch.runWithExpectedCount(10, () -> myEmpiSubmitSvc.submitAllTargetTypesToEmpi(null));
+		afterMdmLatch.runWithExpectedCount(10, () -> myMdmSubmitSvc.submitAllTargetTypesToMdm(null));
 
 		assertLinkCount(10);
 	}
 
 	@Test
-	public void testEmpiOnTargetTypeWithCriteria() throws InterruptedException {
+	public void testMdmOnTargetTypeWithCriteria() throws InterruptedException {
 		createPatient(buildPatientWithNameIdAndBirthday("gary", "gary_id", new Date()));
 		createPatient(buildPatientWithNameIdAndBirthday("john", "john_id", DateUtils.addDays(new Date(), -300)));
 
 		assertLinkCount(0);
 
 		//SUT
-		afterEmpiLatch.runWithExpectedCount(1, () -> myEmpiSubmitSvc.submitTargetTypeToEmpi("Patient", "Patient?name=gary"));
+		afterMdmLatch.runWithExpectedCount(1, () -> myMdmSubmitSvc.submitTargetTypeToMdm("Patient", "Patient?name=gary"));
 
 		assertLinkCount(1);
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiCandidateSearchCriteriaBuilderSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java
similarity index 59%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiCandidateSearchCriteriaBuilderSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java
index 457d4737d75..db439e71cf9 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiCandidateSearchCriteriaBuilderSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.rules.json.EmpiResourceSearchParamJson;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiCandidateSearchCriteriaBuilderSvc;
+import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchCriteriaBuilderSvc;
 import org.hl7.fhir.r4.model.HumanName;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.Test;
@@ -20,16 +20,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
+public class MdmCandidateSearchCriteriaBuilderSvcTest extends BaseMdmR4Test {
 	@Autowired
-    EmpiCandidateSearchCriteriaBuilderSvc myEmpiCandidateSearchCriteriaBuilderSvc;
+	MdmCandidateSearchCriteriaBuilderSvc myMdmCandidateSearchCriteriaBuilderSvc;
 
 	@Test
 	public void testEmptyCase() {
 		Patient patient = new Patient();
-		EmpiResourceSearchParamJson searchParamJson = new EmpiResourceSearchParamJson();
+		MdmResourceSearchParamJson searchParamJson = new MdmResourceSearchParamJson();
 		searchParamJson.addSearchParam("family");
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
 		assertFalse(result.isPresent());
 	}
 
@@ -37,9 +37,9 @@ public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
 	public void testSimpleCase() {
 		Patient patient = new Patient();
 		patient.addName().setFamily("Fernandez");
-		EmpiResourceSearchParamJson searchParamJson = new EmpiResourceSearchParamJson();
+		MdmResourceSearchParamJson searchParamJson = new MdmResourceSearchParamJson();
 		searchParamJson.addSearchParam("family");
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
 		assertTrue(result.isPresent());
 		assertEquals("Patient?family=Fernandez", result.get());
 	}
@@ -51,10 +51,10 @@ public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
 		humanName.addGiven("Jose");
 		humanName.addGiven("Martin");
 		humanName.setFamily("Fernandez");
-		EmpiResourceSearchParamJson searchParamJson = new EmpiResourceSearchParamJson();
+		MdmResourceSearchParamJson searchParamJson = new MdmResourceSearchParamJson();
 		searchParamJson.addSearchParam("given");
 		searchParamJson.addSearchParam("family");
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
 		assertTrue(result.isPresent());
 		assertThat(result.get(), anyOf(equalTo("Patient?given=Jose,Martin&family=Fernandez"), equalTo("Patient?given=Martin,Jose&family=Fernandez")));
 	}
@@ -63,9 +63,9 @@ public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
 	public void testIdentifier() {
 		Patient patient = new Patient();
 		patient.addIdentifier().setSystem("urn:oid:1.2.36.146.595.217.0.1").setValue("12345");
-		EmpiResourceSearchParamJson searchParamJson = new EmpiResourceSearchParamJson();
+		MdmResourceSearchParamJson searchParamJson = new MdmResourceSearchParamJson();
 		searchParamJson.addSearchParam("identifier");
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
 		assertTrue(result.isPresent());
 		assertEquals(result.get(), "Patient?identifier=urn%3Aoid%3A1.2.36.146.595.217.0.1%7C12345");
 	}
@@ -74,9 +74,9 @@ public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
 	public void testIdentifierSpaceIsEscaped() {
 		Patient patient = new Patient();
 		patient.addIdentifier().setSystem("urn:oid:1.2.36.146.595.217.0.1").setValue("abc def");
-		EmpiResourceSearchParamJson searchParamJson = new EmpiResourceSearchParamJson();
+		MdmResourceSearchParamJson searchParamJson = new MdmResourceSearchParamJson();
 		searchParamJson.addSearchParam("identifier");
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), searchParamJson);
 		assertTrue(result.isPresent());
 		assertEquals("Patient?identifier=urn%3Aoid%3A1.2.36.146.595.217.0.1%7Cabc%20def", result.get());
 	}
@@ -84,7 +84,7 @@ public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
 	@Test
 	public void testOmittingCandidateSearchParamsIsAllowed() {
 		Patient patient = new Patient();
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), null);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, Collections.emptyList(), null);
 		assertThat(result.isPresent(), is(true));
 		assertThat(result.get(), is(equalTo("Patient?")));
 	}
@@ -93,7 +93,7 @@ public class EmpiCandidateSearchCriteriaBuilderSvcTest extends BaseEmpiR4Test {
 	public void testEmptyCandidateSearchParamsWorksInConjunctionWithFilterParams() {
 		Patient patient = new Patient();
 		List<String> filterParams = Collections.singletonList("active=true");
-		Optional<String> result = myEmpiCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, filterParams, null);
+		Optional<String> result = myMdmCandidateSearchCriteriaBuilderSvc.buildResourceQueryString("Patient", patient, filterParams, null);
 		assertThat(result.isPresent(), is(true));
 		assertThat(result.get(), is(equalTo("Patient?active=true")));
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiCandidateSearchSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java
similarity index 75%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiCandidateSearchSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java
index 17c56fb94e7..55288727bb1 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiCandidateSearchSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.empi.svc.candidate.EmpiCandidateSearchSvc;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.r4.model.Patient;
 import org.hl7.fhir.r4.model.Practitioner;
@@ -17,10 +17,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class EmpiCandidateSearchSvcTest extends BaseEmpiR4Test {
+public class MdmCandidateSearchSvcTest extends BaseMdmR4Test {
 
 	@Autowired
-    EmpiCandidateSearchSvc myEmpiCandidateSearchSvc;
+	MdmCandidateSearchSvc myMdmCandidateSearchSvc;
 
 	@Test
 	public void testFindCandidates() {
@@ -29,7 +29,7 @@ public class EmpiCandidateSearchSvcTest extends BaseEmpiR4Test {
 		createPatient(jane);
 		Patient newJane = buildJanePatient();
 
-		Collection<IAnyResource> result = myEmpiCandidateSearchSvc.findCandidates("Patient", newJane);
+		Collection<IAnyResource> result = myMdmCandidateSearchSvc.findCandidates("Patient", newJane);
 		assertEquals(1, result.size());
 	}
 
@@ -44,7 +44,7 @@ public class EmpiCandidateSearchSvcTest extends BaseEmpiR4Test {
 
 		Patient newJane = buildJaneWithBirthday(today);
 
-		Collection<IAnyResource> result = myEmpiCandidateSearchSvc.findCandidates("Patient", newJane);
+		Collection<IAnyResource> result = myMdmCandidateSearchSvc.findCandidates("Patient", newJane);
 		assertEquals(1, result.size());
 	}
 
@@ -62,7 +62,7 @@ public class EmpiCandidateSearchSvcTest extends BaseEmpiR4Test {
 		incomingPatient.setActive(true);
 		incomingPatient.setGeneralPractitioner(Collections.singletonList(new Reference(practitionerAndUpdateLinks.getId())));
 
-		Collection<IAnyResource> patient = myEmpiCandidateSearchSvc.findCandidates("Patient", incomingPatient);
+		Collection<IAnyResource> patient = myMdmCandidateSearchSvc.findCandidates("Patient", incomingPatient);
 		assertThat(patient, hasSize(1));
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java
similarity index 53%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java
index c57faa9d0fe..6ed6c29a863 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiLinkSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java
@@ -1,16 +1,13 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.entity.MdmLink;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import org.assertj.core.util.Lists;
 import org.hamcrest.Matchers;
-import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.AfterEach;
@@ -27,18 +24,17 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiLinkSvcTest extends BaseEmpiR4Test {
-	private static final EmpiMatchOutcome POSSIBLE_MATCH = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.POSSIBLE_MATCH);
+public class MdmLinkSvcTest extends BaseMdmR4Test {
+	private static final MdmMatchOutcome POSSIBLE_MATCH = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.POSSIBLE_MATCH);
 	@Autowired
-	IEmpiLinkSvc myEmpiLinkSvc;
+	IMdmLinkSvc myMdmLinkSvc;
 
 	@Override
 	@AfterEach
 	public void after() throws IOException {
-		myExpungeEverythingService.expungeEverythingByType(EmpiLink.class);
+		myExpungeEverythingService.expungeEverythingByType(MdmLink.class);
 		super.after();
 	}
 
@@ -46,8 +42,8 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 	public void compareEmptyPatients() {
 		Patient patient = new Patient();
 		patient.setId("Patient/1");
-		EmpiMatchResultEnum result = myEmpiResourceMatcherSvc.getMatchResult(patient, patient).getMatchResultEnum();
-		assertEquals(EmpiMatchResultEnum.NO_MATCH, result);
+		MdmMatchResultEnum result = myMdmResourceMatcherSvc.getMatchResult(patient, patient).getMatchResultEnum();
+		assertEquals(MdmMatchResultEnum.NO_MATCH, result);
 	}
 
 	@Test
@@ -59,7 +55,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 		Patient patient = createPatient();
 
 		{
-			myEmpiLinkSvc.updateLink(goldenPatient, patient, POSSIBLE_MATCH, EmpiLinkSourceEnum.AUTO, createContextForCreate("Patient"));
+			myMdmLinkSvc.updateLink(goldenPatient, patient, POSSIBLE_MATCH, MdmLinkSourceEnum.AUTO, createContextForCreate("Patient"));
 			assertLinkCount(1);
 			// TODO NG should be ok to remove
 			// Patient newSourcePatient = myPatientDao.read(sourcePatientId);
@@ -67,7 +63,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 		}
 
 		{
-			myEmpiLinkSvc.updateLink(goldenPatient, patient, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
+			myMdmLinkSvc.updateLink(goldenPatient, patient, MdmMatchOutcome.NO_MATCH, MdmLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
 			assertLinkCount(1);
 			// TODO NG should be ok to remove
 			// Patient newSourcePatient = myPatientDao.read(sourcePatientId);
@@ -82,7 +78,7 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 		Patient goldenPatient1 = createGoldenPatient();
 		Patient goldenPatient2 = createGoldenPatient();
 		// TODO GGG MDM NOT VALID
-		myEmpiLinkSvc.updateLink(goldenPatient1, goldenPatient2, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, createContextForCreate("Patient"));
+		myMdmLinkSvc.updateLink(goldenPatient1, goldenPatient2, MdmMatchOutcome.POSSIBLE_DUPLICATE, MdmLinkSourceEnum.AUTO, createContextForCreate("Patient"));
 		assertLinkCount(1);
 	}
 
@@ -94,13 +90,13 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 
 		Long goldenPatient1Pid = myIdHelperService.getPidOrNull(goldenPatient1);
 		Long goldenPatient2Pid = myIdHelperService.getPidOrNull(goldenPatient2);
-		assertFalse(myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient1Pid, goldenPatient2Pid).isPresent());
-		assertFalse(myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient2Pid, goldenPatient1Pid).isPresent());
+		assertFalse(myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient1Pid, goldenPatient2Pid).isPresent());
+		assertFalse(myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient2Pid, goldenPatient1Pid).isPresent());
 
 		saveNoMatchLink(goldenPatient1Pid, goldenPatient2Pid);
 
-		myEmpiLinkSvc.updateLink(goldenPatient1, goldenPatient2, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, createContextForCreate("Person"));
-		assertFalse(myEmpiLinkDaoSvc.getEmpiLinksByPersonPidTargetPidAndMatchResult(goldenPatient1Pid, goldenPatient2Pid, EmpiMatchResultEnum.POSSIBLE_DUPLICATE).isPresent());
+		myMdmLinkSvc.updateLink(goldenPatient1, goldenPatient2, MdmMatchOutcome.POSSIBLE_DUPLICATE, MdmLinkSourceEnum.AUTO, createContextForCreate("Person"));
+		assertFalse(myMdmLinkDaoSvc.getMdmLinksByPersonPidTargetPidAndMatchResult(goldenPatient1Pid, goldenPatient2Pid, MdmMatchResultEnum.POSSIBLE_DUPLICATE).isPresent());
 		assertLinkCount(1);
 	}
 
@@ -112,52 +108,52 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 
 		Long goldenPatient1Pid = myIdHelperService.getPidOrNull(goldenPatient1);
 		Long goldenPatient2Pid = myIdHelperService.getPidOrNull(goldenPatient2);
-		assertFalse(myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient1Pid, goldenPatient2Pid).isPresent());
-		assertFalse(myEmpiLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient2Pid, goldenPatient1Pid).isPresent());
+		assertFalse(myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient1Pid, goldenPatient2Pid).isPresent());
+		assertFalse(myMdmLinkDaoSvc.getLinkBySourceResourcePidAndTargetResourcePid(goldenPatient2Pid, goldenPatient1Pid).isPresent());
 
 		saveNoMatchLink(goldenPatient2Pid, goldenPatient1Pid);
 
-		myEmpiLinkSvc.updateLink(goldenPatient1, goldenPatient2, EmpiMatchOutcome.POSSIBLE_DUPLICATE, EmpiLinkSourceEnum.AUTO, createContextForCreate("Person"));
-		assertFalse(myEmpiLinkDaoSvc.getEmpiLinksByPersonPidTargetPidAndMatchResult(goldenPatient1Pid, goldenPatient2Pid, EmpiMatchResultEnum.POSSIBLE_DUPLICATE).isPresent());
+		myMdmLinkSvc.updateLink(goldenPatient1, goldenPatient2, MdmMatchOutcome.POSSIBLE_DUPLICATE, MdmLinkSourceEnum.AUTO, createContextForCreate("Person"));
+		assertFalse(myMdmLinkDaoSvc.getMdmLinksByPersonPidTargetPidAndMatchResult(goldenPatient1Pid, goldenPatient2Pid, MdmMatchResultEnum.POSSIBLE_DUPLICATE).isPresent());
 		assertLinkCount(1);
 	}
 
 	private void saveNoMatchLink(Long theGoldenResourcePid, Long theTargetPid) {
-		EmpiLink noMatchLink = myEmpiLinkDaoSvc.newEmpiLink()
+		MdmLink noMatchLink = myMdmLinkDaoSvc.newMdmLink()
 			.setGoldenResourcePid(theGoldenResourcePid)
 			.setTargetPid(theTargetPid)
-			.setLinkSource(EmpiLinkSourceEnum.MANUAL)
-			.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
+			.setLinkSource(MdmLinkSourceEnum.MANUAL)
+			.setMatchResult(MdmMatchResultEnum.NO_MATCH);
 		saveLink(noMatchLink);
 	}
 
 	@Test
-	public void testManualEmpiLinksCannotBeModifiedBySystem() {
+	public void testManualMdmLinksCannotBeModifiedBySystem() {
 //		Patient goldenPatient = createGoldenPatient(buildJaneSourcePatient());
 		Patient goldenPatient = createGoldenPatient(buildJanePatient());
 		Patient patient = createPatient(buildJanePatient());
 
-		myEmpiLinkSvc.updateLink(goldenPatient, patient, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
+		myMdmLinkSvc.updateLink(goldenPatient, patient, MdmMatchOutcome.NO_MATCH, MdmLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
 		try {
-			myEmpiLinkSvc.updateLink(goldenPatient, patient, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, null);
+			myMdmLinkSvc.updateLink(goldenPatient, patient, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.AUTO, null);
 			fail();
 		} catch (InternalErrorException e) {
-			assertThat(e.getMessage(), is(equalTo("EMPI system is not allowed to modify links on manually created links")));
+			assertThat(e.getMessage(), is(equalTo("MDM system is not allowed to modify links on manually created links")));
 		}
 	}
 
 	@Test
-	public void testAutomaticallyAddedNO_MATCHEmpiLinksAreNotAllowed() {
+	public void testAutomaticallyAddedNO_MATCHMdmLinksAreNotAllowed() {
 //		Patient goldenPatient = createGoldenPatient(buildJaneSourcePatient());
 		Patient goldenPatient = createGoldenPatient(buildJanePatient());
 		Patient patient = createPatient(buildJanePatient());
 
 		// Test: it should be impossible to have a AUTO NO_MATCH record.  The only NO_MATCH records in the system must be MANUAL.
 		try {
-			myEmpiLinkSvc.updateLink(goldenPatient, patient, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.AUTO, createContextForUpdate("Patient"));
+			myMdmLinkSvc.updateLink(goldenPatient, patient, MdmMatchOutcome.NO_MATCH, MdmLinkSourceEnum.AUTO, createContextForUpdate("Patient"));
 			fail();
 		} catch (InternalErrorException e) {
-			assertThat(e.getMessage(), is(equalTo("EMPI system is not allowed to automatically NO_MATCH a resource")));
+			assertThat(e.getMessage(), is(equalTo("MDM system is not allowed to automatically NO_MATCH a resource")));
 		}
 	}
 
@@ -167,13 +163,12 @@ public class EmpiLinkSvcTest extends BaseEmpiR4Test {
 		Patient goldenPatient = createGoldenPatient(buildJanePatient());
 		Patient patient1 = createPatient(buildJanePatient());
 		Patient patient2 = createPatient(buildJanePatient());
-		assertEquals(0, myEmpiLinkDao.count());
+		assertEquals(0, myMdmLinkDao.count());
 
-		myEmpiLinkDaoSvc.createOrUpdateLinkEntity(goldenPatient, patient1, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
-		myEmpiLinkDaoSvc.createOrUpdateLinkEntity(goldenPatient, patient2, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
-//		myEmpiLinkSvc.syncEmpiLinksToPersonLinks(sourcePatient, createContextForCreate("Patient"));
+		myMdmLinkDaoSvc.createOrUpdateLinkEntity(goldenPatient, patient1, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
+		myMdmLinkDaoSvc.createOrUpdateLinkEntity(goldenPatient, patient2, MdmMatchOutcome.NO_MATCH, MdmLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
 
-		List<EmpiLink> targets = myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(goldenPatient);
+		List<MdmLink> targets = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(goldenPatient);
 		assertFalse(targets.isEmpty());
 		assertEquals(2, targets.size());
 		// TODO NG - OK? original assertTrue(goldenPatient.hasLink());
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcMultipleEidModeTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java
similarity index 83%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcMultipleEidModeTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java
index 23a1d760b3c..5588df0b346 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcMultipleEidModeTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java
@@ -1,10 +1,10 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Patient;
@@ -18,9 +18,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.MATCH;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.POSSIBLE_DUPLICATE;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.POSSIBLE_MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.POSSIBLE_DUPLICATE;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.POSSIBLE_MATCH;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
@@ -30,16 +30,16 @@ import static org.hamcrest.Matchers.not;
 import static org.slf4j.LoggerFactory.getLogger;
 
 @TestPropertySource(properties = {
-	"empi.prevent_multiple_eids=false"
+	"mdm.prevent_multiple_eids=false"
 })
-public class EmpiMatchLinkSvcMultipleEidModeTest extends BaseEmpiR4Test {
-	private static final Logger ourLog = getLogger(EmpiMatchLinkSvcMultipleEidModeTest.class);
+public class MdmMatchLinkSvcMultipleEidModeTest extends BaseMdmR4Test {
+	private static final Logger ourLog = getLogger(MdmMatchLinkSvcMultipleEidModeTest.class);
 	@Autowired
 	private EIDHelper myEidHelper;
 
 	@BeforeEach
 	public void before() {
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 	}
 
 	@Test
@@ -71,16 +71,16 @@ public class EmpiMatchLinkSvcMultipleEidModeTest extends BaseEmpiR4Test {
 
 		//The collision should have kept the old identifier
 		Identifier firstIdentifier = identifier.get(0);
-		assertThat(firstIdentifier.getSystem(), is(equalTo(EmpiConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM)));
+		assertThat(firstIdentifier.getSystem(), is(equalTo(MdmConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM)));
 		assertThat(firstIdentifier.getValue(), is(equalTo(foundHapiEid)));
 
 		//The collision should have added a new identifier with the external system.
 		Identifier secondIdentifier = identifier.get(1);
-		assertThat(secondIdentifier.getSystem(), is(equalTo(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem())));
+		assertThat(secondIdentifier.getSystem(), is(equalTo(myMdmSettings.getMdmRules().getEnterpriseEIDSystem())));
 		assertThat(secondIdentifier.getValue(), is(equalTo("12345")));
 
 		Identifier thirdIdentifier = identifier.get(2);
-		assertThat(thirdIdentifier.getSystem(), is(equalTo(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem())));
+		assertThat(thirdIdentifier.getSystem(), is(equalTo(myMdmSettings.getMdmRules().getEnterpriseEIDSystem())));
 		assertThat(thirdIdentifier.getValue(), is(equalTo("67890")));
 	}
 
@@ -145,7 +145,7 @@ public class EmpiMatchLinkSvcMultipleEidModeTest extends BaseEmpiR4Test {
 		assertLinksCreatedNewResource(true, true, false);
 		assertLinksMatchedByEid(false, false, true);
 
-		List<EmpiLink> possibleDuplicates = myEmpiLinkDaoSvc.getPossibleDuplicates();
+		List<MdmLink> possibleDuplicates = myMdmLinkDaoSvc.getPossibleDuplicates();
 		assertThat(possibleDuplicates, hasSize(1));
 
 		List<Long> duplicatePids = Stream.of(patient1, patient2)
@@ -154,9 +154,9 @@ public class EmpiMatchLinkSvcMultipleEidModeTest extends BaseEmpiR4Test {
 			.collect(Collectors.toList());
 
 		//The two Persons related to the patients should both show up in the only existing POSSIBLE_DUPLICATE EmpiLink.
-		EmpiLink empiLink = possibleDuplicates.get(0);
-		assertThat(empiLink.getSourceResourcePid(), is(in(duplicatePids)));
-		assertThat(empiLink.getTargetPid(), is(in(duplicatePids)));
+		MdmLink mdmLink = possibleDuplicates.get(0);
+		assertThat(mdmLink.getGoldenResourcePid(), is(in(duplicatePids)));
+		assertThat(mdmLink.getTargetPid(), is(in(duplicatePids)));
 	}
 
 	@Test
@@ -200,11 +200,11 @@ public class EmpiMatchLinkSvcMultipleEidModeTest extends BaseEmpiR4Test {
 		assertLinksCreatedNewResource(true, true, false, false, false);
 		assertLinksMatchedByEid(false, true, true, true, true);
 
-		assertThat(patient2, is(not(matchedToAPerson())));
+		assertThat(patient2, is(not(matchedToAGoldenResource())));
 		assertThat(patient2, is(possibleMatchWith(patient1)));
 		assertThat(patient2, is(possibleMatchWith(patient3)));
 
-		List<EmpiLink> possibleDuplicates = myEmpiLinkDaoSvc.getPossibleDuplicates();
+		List<MdmLink> possibleDuplicates = myMdmLinkDaoSvc.getPossibleDuplicates();
 		assertThat(possibleDuplicates, hasSize(1));
 		assertThat(patient3, is(possibleDuplicateOf(patient1)));
 	}
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java
similarity index 86%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java
index c43bc7faefd..28cd61dd701 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java
@@ -1,17 +1,17 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.util.EIDHelper;
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.empi.util.PersonHelper;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.IMdmLinkSvc;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
-import ca.uhn.fhir.jpa.dao.data.IEmpiLinkDao;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.dao.data.IMdmLinkDao;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
 import ca.uhn.fhir.rest.param.TokenParam;
@@ -32,10 +32,10 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.MATCH;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.NO_MATCH;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.POSSIBLE_DUPLICATE;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.POSSIBLE_MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.NO_MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.POSSIBLE_DUPLICATE;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.POSSIBLE_MATCH;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.blankOrNullString;
 import static org.hamcrest.Matchers.equalTo;
@@ -48,24 +48,24 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.slf4j.LoggerFactory.getLogger;
 
-public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
+public class MdmMatchLinkSvcTest extends BaseMdmR4Test {
 
-	private static final Logger ourLog = getLogger(EmpiMatchLinkSvcTest.class);
+	private static final Logger ourLog = getLogger(MdmMatchLinkSvcTest.class);
 
 	@Autowired
-	IEmpiLinkSvc myEmpiLinkSvc;
+	IMdmLinkSvc myEmpiLinkSvc;
 	@Autowired
 	private EIDHelper myEidHelper;
 	@Autowired
-	private PersonHelper myPersonHelper;
+	private GoldenResourceHelper myGoldenResourceHelper;
 	@Autowired
-	private IEmpiLinkDao myEmpiLinkDao;
+	private IMdmLinkDao myEmpiLinkDao;
 	@Autowired
 	private DaoRegistry myDaoRegistry;
 
 	@BeforeEach
 	public void before() {
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 	}
 
 	@Test
@@ -123,10 +123,10 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 
 		//Create a manual NO_MATCH between janePerson and unmatchedJane.
 		Patient unmatchedJane = createPatient(buildJanePatient());
-		myEmpiLinkSvc.updateLink(janePerson, unmatchedJane, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
+		myEmpiLinkSvc.updateLink(janePerson, unmatchedJane, MdmMatchOutcome.NO_MATCH, MdmLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
 
 		//rerun EMPI rules against unmatchedJane.
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(unmatchedJane, createContextForCreate("Patient"));
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(unmatchedJane, createContextForCreate("Patient"));
 
 		assertThat(unmatchedJane, is(not(sameSourceResourceAs(janePerson))));
 		assertThat(unmatchedJane, is(not(linkedTo(originalJane))));
@@ -146,12 +146,12 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 		Patient unmatchedPatient = createPatient(buildJanePatient());
 
 		// This simulates an admin specifically saying that unmatchedPatient does NOT match janePerson.
-		myEmpiLinkSvc.updateLink(janePerson, unmatchedPatient, EmpiMatchOutcome.NO_MATCH, EmpiLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
+		myEmpiLinkSvc.updateLink(janePerson, unmatchedPatient, MdmMatchOutcome.NO_MATCH, MdmLinkSourceEnum.MANUAL, createContextForCreate("Patient"));
 		// TODO change this so that it will only partially match.
 
 		//Now normally, when we run update links, it should link to janePerson. However, this manual NO_MATCH link
 		//should cause a whole new Person to be created.
-		myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(unmatchedPatient, createContextForCreate("Patient"));
+		myMdmMatchLinkSvc.updateMdmLinksForMdmTarget(unmatchedPatient, createContextForCreate("Patient"));
 
 		assertThat(unmatchedPatient, is(not(sameSourceResourceAs(janePerson))));
 		assertThat(unmatchedPatient, is(not(linkedTo(originalJane))));
@@ -167,24 +167,24 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 		Patient janePatient = addExternalEID(buildJanePatient(), sampleEID);
 		janePatient = createPatientAndUpdateLinks(janePatient);
 
-		Optional<EmpiLink> empiLink = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(janePatient.getIdElement().getIdPartAsLong());
+		Optional<MdmLink> empiLink = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(janePatient.getIdElement().getIdPartAsLong());
 		assertThat(empiLink.isPresent(), is(true));
 
 		Patient patient = getTargetResourceFromEmpiLink(empiLink.get(), "Patient");
 		List<CanonicalEID> externalEid = myEidHelper.getExternalEid(patient);
 
-		assertThat(externalEid.get(0).getSystem(), is(equalTo(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem())));
+		assertThat(externalEid.get(0).getSystem(), is(equalTo(myMdmSettings.getMdmRules().getEnterpriseEIDSystem())));
 		assertThat(externalEid.get(0).getValue(), is(equalTo(sampleEID)));
 	}
 
 	@Test
 	public void testWhenPatientIsCreatedWithoutAnEIDThePersonGetsAutomaticallyAssignedOne() {
 		Patient patient = createPatientAndUpdateLinks(buildJanePatient());
-		EmpiLink empiLink = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(patient.getIdElement().getIdPartAsLong()).get();
+		MdmLink mdmLink = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(patient.getIdElement().getIdPartAsLong()).get();
 
-		Patient targetPatient = getTargetResourceFromEmpiLink(empiLink, "Patient");
+		Patient targetPatient = getTargetResourceFromEmpiLink(mdmLink, "Patient");
 		Identifier identifierFirstRep = targetPatient.getIdentifierFirstRep();
-		assertThat(identifierFirstRep.getSystem(), is(equalTo(EmpiConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM)));
+		assertThat(identifierFirstRep.getSystem(), is(equalTo(MdmConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM)));
 		assertThat(identifierFirstRep.getValue(), not(blankOrNullString()));
 	}
 
@@ -192,7 +192,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 	public void testPatientAttributesAreCopiedOverWhenPersonIsCreatedFromPatient() {
 		Patient patient = createPatientAndUpdateLinks(buildPatientWithNameIdAndBirthday("Gary", "GARY_ID", new Date()));
 
-		Optional<EmpiLink> empiLink = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(patient.getIdElement().getIdPartAsLong());
+		Optional<MdmLink> empiLink = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(patient.getIdElement().getIdPartAsLong());
 		Patient read = getTargetResourceFromEmpiLink(empiLink.get(), "Patient");
 
 		// TODO NG - rules haven't been determined yet revisit once implemented...
@@ -232,12 +232,12 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 
 		//The collision should have kept the old identifier
 		Identifier firstIdentifier = identifier.get(0);
-		assertThat(firstIdentifier.getSystem(), is(equalTo(EmpiConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM)));
+		assertThat(firstIdentifier.getSystem(), is(equalTo(MdmConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM)));
 		assertThat(firstIdentifier.getValue(), is(equalTo(foundHapiEid)));
 
 		//The collision should have added a new identifier with the external system.
 		Identifier secondIdentifier = identifier.get(1);
-		assertThat(secondIdentifier.getSystem(), is(equalTo(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem())));
+		assertThat(secondIdentifier.getSystem(), is(equalTo(myMdmSettings.getMdmRules().getEnterpriseEIDSystem())));
 		assertThat(secondIdentifier.getValue(), is(equalTo("12345")));
 	}
 
@@ -281,7 +281,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 		Patient patient2 = addExternalEID(buildJanePatient(), "eid-2");
 		patient2 = createPatientAndUpdateLinks(patient2);
 
-		List<EmpiLink> possibleDuplicates = myEmpiLinkDaoSvc.getPossibleDuplicates();
+		List<MdmLink> possibleDuplicates = myMdmLinkDaoSvc.getPossibleDuplicates();
 		assertThat(possibleDuplicates, hasSize(1));
 
 
@@ -291,16 +291,16 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 			.collect(Collectors.toList());
 
 		//The two Persons related to the patients should both show up in the only existing POSSIBLE_DUPLICATE EmpiLink.
-		EmpiLink empiLink = possibleDuplicates.get(0);
-		assertThat(empiLink.getSourceResourcePid(), is(in(duplicatePids)));
-		assertThat(empiLink.getTargetPid(), is(in(duplicatePids)));
+		MdmLink mdmLink = possibleDuplicates.get(0);
+		assertThat(mdmLink.getGoldenResourcePid(), is(in(duplicatePids)));
+		assertThat(mdmLink.getTargetPid(), is(in(duplicatePids)));
 	}
 
 	@Test
 	public void testPatientWithNoEmpiTagIsNotMatched() {
 		// Patient with "no-empi" tag is not matched
 		Patient janePatient = buildJanePatient();
-		janePatient.getMeta().addTag(EmpiConstants.SYSTEM_MDM_MANAGED, EmpiConstants.CODE_NO_EMPI_MANAGED, "Don't EMPI on me!");
+		janePatient.getMeta().addTag(MdmConstants.SYSTEM_MDM_MANAGED, MdmConstants.CODE_NO_MDM_MANAGED, "Don't EMPI on me!");
 		createPatientAndUpdateLinks(janePatient);
 		assertLinkCount(0);
 	}
@@ -332,7 +332,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 		assertLinkCount(0);
 		Patient janePatient = createPatientAndUpdateLinks(buildJanePatient());
 		assertLinkCount(1);
-		assertThat(janePatient, is(matchedToAPerson()));
+		assertThat(janePatient, is(matchedToAGoldenResource()));
 	}
 
 	@Test
@@ -363,8 +363,8 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 
 		//In a normal situation, janePatient2 would just match to jane patient, but here we need to hack it so they are their
 		//own individual Persons for the purpose of this test.
-		IAnyResource person = myPersonHelper.createGoldenResourceFromMdmTarget(janePatient2);
-		myEmpiLinkSvc.updateLink(person, janePatient2, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, createContextForCreate("Patient"));
+		IAnyResource person = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(janePatient2);
+		myEmpiLinkSvc.updateLink(person, janePatient2, MdmMatchOutcome.NEW_PERSON_MATCH, MdmLinkSourceEnum.AUTO, createContextForCreate("Patient"));
 		assertThat(janePatient, is(not(sameSourceResourceAs(janePatient2))));
 
 		//In theory, this will match both Persons!
@@ -377,7 +377,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 		assertThat(incomingJanePatient, is(possibleMatchWith(janePatient, janePatient2)));
 
 		//Ensure there is no successful MATCH links for incomingJanePatient
-		Optional<EmpiLink> matchedLinkForTargetPid = myEmpiLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(incomingJanePatient));
+		Optional<MdmLink> matchedLinkForTargetPid = myMdmLinkDaoSvc.getMatchedLinkForTargetPid(myIdHelperService.getPidOrNull(incomingJanePatient));
 		assertThat(matchedLinkForTargetPid.isPresent(), is(false));
 
 		logAllLinks();
@@ -426,7 +426,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 	private SearchParameterMap buildGoldenRecordSearchParameterMap() {
 		SearchParameterMap searchParameterMap = new SearchParameterMap();
 		searchParameterMap.setLoadSynchronous(true);
-		searchParameterMap.add("_tag", new TokenParam(EmpiConstants.SYSTEM_MDM_MANAGED, EmpiConstants.CODE_HAPI_MDM_MANAGED));
+		searchParameterMap.add("_tag", new TokenParam(MdmConstants.SYSTEM_MDM_MANAGED, MdmConstants.CODE_HAPI_MDM_MANAGED));
 		return searchParameterMap;
 	}
 
@@ -454,10 +454,10 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 	public void testCreateSourceResourceFromEmpiTarget() {
 		// Create Use Case #2 - adding patient with no EID
 		Patient janePatient = buildJanePatient();
-		Patient janeSourceResourcePatient = myPersonHelper.createGoldenResourceFromMdmTarget(janePatient);
+		Patient janeSourceResourcePatient = myGoldenResourceHelper.createGoldenResourceFromMdmTarget(janePatient);
 
 		// golden record now contains HAPI-generated EID and HAPI tag
-		assertTrue(EmpiUtil.isEmpiManaged(janeSourceResourcePatient));
+		assertTrue(MdmUtil.isMdmManaged(janeSourceResourcePatient));
 		assertFalse(myEidHelper.getHapiEid(janeSourceResourcePatient).isEmpty());
 
 		// original checks - verifies that EIDs are assigned
@@ -586,7 +586,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 	}
 
 	private void assertNoDuplicates() {
-		List<EmpiLink> possibleDuplicates = myEmpiLinkDaoSvc.getPossibleDuplicates();
+		List<MdmLink> possibleDuplicates = myMdmLinkDaoSvc.getPossibleDuplicates();
 		assertThat(possibleDuplicates, hasSize(0));
 	}
 
@@ -621,7 +621,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
 
 		assertThat(patient2, is(sameSourceResourceAs(patient1)));
 
-		List<EmpiLink> possibleDuplicates = myEmpiLinkDaoSvc.getPossibleDuplicates();
+		List<MdmLink> possibleDuplicates = myMdmLinkDaoSvc.getPossibleDuplicates();
 		assertThat(possibleDuplicates, hasSize(1));
 		assertThat(patient3, is(possibleDuplicateOf(patient1)));
 
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonMergerSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java
similarity index 62%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonMergerSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java
index 94a48bd1e2d..5fb6c3e0d01 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonMergerSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java
@@ -1,15 +1,15 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IGoldenResourceMergerSvc;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IGoldenResourceMergerSvc;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.interceptor.api.IInterceptorService;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
-import ca.uhn.fhir.jpa.empi.helper.EmpiLinkHelper;
-import ca.uhn.fhir.jpa.empi.interceptor.IEmpiStorageInterceptor;
-import ca.uhn.fhir.jpa.entity.EmpiLink;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
+import ca.uhn.fhir.jpa.mdm.helper.MdmLinkHelper;
+import ca.uhn.fhir.jpa.mdm.interceptor.IMdmStorageInterceptor;
+import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.rest.server.TransactionLogMessages;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -37,19 +37,19 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
+public class MdmPersonMergerSvcTest extends BaseMdmR4Test {
 	public static final String GIVEN_NAME = "Jenn";
 	public static final String FAMILY_NAME = "Chan";
 	public static final String POSTAL_CODE = "M6G 1B4";
 	private static final String BAD_GIVEN_NAME = "Bob";
-	private static final EmpiMatchOutcome POSSIBLE_MATCH = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.POSSIBLE_MATCH);
+	private static final MdmMatchOutcome POSSIBLE_MATCH = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.POSSIBLE_MATCH);
 
 	@Autowired
-	IGoldenResourceMergerSvc myEmpiPersonMergerSvc;
+	IGoldenResourceMergerSvc myGoldenResourceMergerSvc;
 	@Autowired
-	EmpiLinkHelper myEmpiLinkHelper;
+	MdmLinkHelper myMdmLinkHelper;
 	@Autowired
-	IEmpiStorageInterceptor myEmpiStorageInterceptor;
+	IMdmStorageInterceptor myMdmStorageInterceptor;
 	@Autowired
 	IInterceptorService myInterceptorService;
 
@@ -63,7 +63,7 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	@BeforeEach
 	public void before() {
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 
 		myFromGoldenPatient = createGoldenPatient();
 		IdType fromSourcePatientId = myFromGoldenPatient.getIdElement().toUnqualifiedVersionless();
@@ -77,13 +77,13 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 		myTargetPatient3 = createPatient();
 
 		// Register the empi storage interceptor after the creates so the delete hook is fired when we merge
-		myInterceptorService.registerInterceptor(myEmpiStorageInterceptor);
+		myInterceptorService.registerInterceptor(myMdmStorageInterceptor);
 	}
 
 	@Override
 	@AfterEach
 	public void after() throws IOException {
-		myInterceptorService.unregisterInterceptor(myEmpiStorageInterceptor);
+		myInterceptorService.unregisterInterceptor(myMdmStorageInterceptor);
 		super.after();
 	}
 	
@@ -102,15 +102,15 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	private Patient mergeGoldenPatients() {
 		assertEquals(0, redirectLinkCount());
-		Patient retval = (Patient) myEmpiPersonMergerSvc.mergeGoldenResources(myFromGoldenPatient, myToGoldenPatient, createEmpiContext());
+		Patient retval = (Patient) myGoldenResourceMergerSvc.mergeGoldenResources(myFromGoldenPatient, myToGoldenPatient, createEmpiContext());
 		assertEquals(1, redirectLinkCount());
 		return retval;
 	}
 
 	private int redirectLinkCount() {
-		EmpiLink empiLink = new EmpiLink().setMatchResult(EmpiMatchResultEnum.REDIRECT);
-		Example<EmpiLink> example = Example.of(empiLink);
-		return myEmpiLinkDao.findAll(example).size();
+		MdmLink mdmLink = new MdmLink().setMatchResult(MdmMatchResultEnum.REDIRECT);
+		Example<MdmLink> example = Example.of(mdmLink);
+		return myMdmLinkDao.findAll(example).size();
 	}
 
 	private MdmTransactionContext createEmpiContext() {
@@ -121,29 +121,29 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	@Test
 	public void mergeRemovesPossibleDuplicatesLink() {
-		EmpiLink empiLink = myEmpiLinkDaoSvc.newEmpiLink()
+		MdmLink mdmLink = myMdmLinkDaoSvc.newMdmLink()
 			.setGoldenResourcePid(myToGoldenPatientPid)
 			.setTargetPid(myFromGoldenPatientPid)
-			.setEmpiTargetType("Patient")
-			.setMatchResult(EmpiMatchResultEnum.POSSIBLE_DUPLICATE)
-			.setLinkSource(EmpiLinkSourceEnum.AUTO);
+			.setMdmTargetType("Patient")
+			.setMatchResult(MdmMatchResultEnum.POSSIBLE_DUPLICATE)
+			.setLinkSource(MdmLinkSourceEnum.AUTO);
 
-		saveLink(empiLink);
+		saveLink(mdmLink);
 
 		{
-			List<EmpiLink> foundLinks = myEmpiLinkDao.findAll();
+			List<MdmLink> foundLinks = myMdmLinkDao.findAll();
 			assertEquals(1, foundLinks.size());
-			assertEquals(EmpiMatchResultEnum.POSSIBLE_DUPLICATE, foundLinks.get(0).getMatchResult());
+			assertEquals(MdmMatchResultEnum.POSSIBLE_DUPLICATE, foundLinks.get(0).getMatchResult());
 		}
 
-		myEmpiLinkHelper.logEmpiLinks();
+		myMdmLinkHelper.logMdmLinks();
 
 		mergeGoldenPatients();
 
 		{
-			List<EmpiLink> foundLinks = myEmpiLinkDao.findAll();
+			List<MdmLink> foundLinks = myMdmLinkDao.findAll();
 			assertEquals(1, foundLinks.size());
-			assertEquals(EmpiMatchResultEnum.REDIRECT, foundLinks.get(0).getMatchResult());
+			assertEquals(MdmMatchResultEnum.REDIRECT, foundLinks.get(0).getMatchResult());
 		}
 	}
 
@@ -173,88 +173,88 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	@Test
 	public void fromLinkToNoLink() {
-		createEmpiLink(myFromGoldenPatient, myTargetPatient1);
+		createMdmLink(myFromGoldenPatient, myTargetPatient1);
 
 		Patient mergedGoldenPatient = mergeGoldenPatients();
-		List<EmpiLink> links = getNonRedirectLinksByPerson(mergedGoldenPatient);
+		List<MdmLink> links = getNonRedirectLinksByPerson(mergedGoldenPatient);
 		assertEquals(1, links.size());
 		assertThat(mergedGoldenPatient, is(possibleLinkedTo(myTargetPatient1)));
 	}
 
 	@Test
 	public void fromNoLinkToLink() {
-		createEmpiLink(myToGoldenPatient, myTargetPatient1);
+		createMdmLink(myToGoldenPatient, myTargetPatient1);
 
 		Patient mergedSourcePatient = mergeGoldenPatients();
-		List<EmpiLink> links = getNonRedirectLinksByPerson(mergedSourcePatient);
+		List<MdmLink> links = getNonRedirectLinksByPerson(mergedSourcePatient);
 		assertEquals(1, links.size());
 		assertThat(mergedSourcePatient, is(possibleLinkedTo(myTargetPatient1)));
 	}
 
 	@Test
 	public void fromManualLinkOverridesAutoToLink() {
-		EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		fromLink.setMatchResult(EmpiMatchResultEnum.MATCH);
+		MdmLink fromLink = createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		fromLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		fromLink.setMatchResult(MdmMatchResultEnum.MATCH);
 		saveLink(fromLink);
 
-		createEmpiLink(myToGoldenPatient, myTargetPatient1);
+		createMdmLink(myToGoldenPatient, myTargetPatient1);
 
 		mergeGoldenPatients();
-		List<EmpiLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
+		List<MdmLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
 		assertEquals(1, links.size());
-		assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
+		assertEquals(MdmLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
 	}
 
-	private List<EmpiLink> getNonRedirectLinksByPerson(Patient theGoldenPatient) {
-		return myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(theGoldenPatient).stream()
+	private List<MdmLink> getNonRedirectLinksByPerson(Patient theGoldenPatient) {
+		return myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theGoldenPatient).stream()
 			.filter(link -> !link.isRedirect())
 			.collect(Collectors.toList());
 	}
 
 	@Test
 	public void fromManualNoMatchLinkOverridesAutoToLink() {
-		EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		fromLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
+		MdmLink fromLink = createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		fromLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		fromLink.setMatchResult(MdmMatchResultEnum.NO_MATCH);
 
 		saveLink(fromLink);
 
-		createEmpiLink(myToGoldenPatient, myTargetPatient1);
+		createMdmLink(myToGoldenPatient, myTargetPatient1);
 
 		mergeGoldenPatients();
-		List<EmpiLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
+		List<MdmLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
 		assertEquals(1, links.size());
-		assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
-		assertEquals(EmpiMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
+		assertEquals(MdmLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
+		assertEquals(MdmMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
 	}
 
 	@Test
 	public void fromManualAutoMatchLinkNoOverridesManualToLink() {
-		createEmpiLink(myFromGoldenPatient, myTargetPatient1);
+		createMdmLink(myFromGoldenPatient, myTargetPatient1);
 
-		EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient1);
-		toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		toLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
+		MdmLink toLink = createMdmLink(myToGoldenPatient, myTargetPatient1);
+		toLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		toLink.setMatchResult(MdmMatchResultEnum.NO_MATCH);
 		saveLink(toLink);
 
 		mergeGoldenPatients();
-		List<EmpiLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
+		List<MdmLink> links = getNonRedirectLinksByPerson(myToGoldenPatient);
 		assertEquals(1, links.size());
-		assertEquals(EmpiLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
-		assertEquals(EmpiMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
+		assertEquals(MdmLinkSourceEnum.MANUAL, links.get(0).getLinkSource());
+		assertEquals(MdmMatchResultEnum.NO_MATCH, links.get(0).getMatchResult());
 	}
 
 	@Test
 	public void fromNoMatchMergeToManualMatchIsError() {
-		EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		fromLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
+		MdmLink fromLink = createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		fromLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		fromLink.setMatchResult(MdmMatchResultEnum.NO_MATCH);
 		saveLink(fromLink);
 
-		EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient1);
-		toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		toLink.setMatchResult(EmpiMatchResultEnum.MATCH);
+		MdmLink toLink = createMdmLink(myToGoldenPatient, myTargetPatient1);
+		toLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		toLink.setMatchResult(MdmMatchResultEnum.MATCH);
 		saveLink(toLink);
 
 		try {
@@ -267,14 +267,14 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	@Test
 	public void fromMatchMergeToManualNoMatchIsError() {
-		EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		fromLink.setMatchResult(EmpiMatchResultEnum.MATCH);
+		MdmLink fromLink = createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		fromLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		fromLink.setMatchResult(MdmMatchResultEnum.MATCH);
 		saveLink(fromLink);
 
-		EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient1);
-		toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		toLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
+		MdmLink toLink = createMdmLink(myToGoldenPatient, myTargetPatient1);
+		toLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		toLink.setMatchResult(MdmMatchResultEnum.NO_MATCH);
 		saveLink(toLink);
 
 		try {
@@ -287,14 +287,14 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	@Test
 	public void fromNoMatchMergeToManualMatchDifferentPatientIsOk() {
-		EmpiLink fromLink = createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		fromLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		fromLink.setMatchResult(EmpiMatchResultEnum.NO_MATCH);
+		MdmLink fromLink = createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		fromLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		fromLink.setMatchResult(MdmMatchResultEnum.NO_MATCH);
 		saveLink(fromLink);
 
-		EmpiLink toLink = createEmpiLink(myToGoldenPatient, myTargetPatient2);
-		toLink.setLinkSource(EmpiLinkSourceEnum.MANUAL);
-		toLink.setMatchResult(EmpiMatchResultEnum.MATCH);
+		MdmLink toLink = createMdmLink(myToGoldenPatient, myTargetPatient2);
+		toLink.setLinkSource(MdmLinkSourceEnum.MANUAL);
+		toLink.setMatchResult(MdmMatchResultEnum.MATCH);
 		saveLink(toLink);
 
 		mergeGoldenPatients();
@@ -302,18 +302,18 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 		assertResourceHasLinkCount(myToGoldenPatient, 3);
 		assertResourceHasLinkCount(myFromGoldenPatient, 0);
 		// TODO ENSURE PROPER LINK TYPES
-		assertEquals(3, myEmpiLinkDao.count());
+		assertEquals(3, myMdmLinkDao.count());
 	}
 
 	@Test
 	public void from123To1() {
-		createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		createEmpiLink(myFromGoldenPatient, myTargetPatient2);
-		createEmpiLink(myFromGoldenPatient, myTargetPatient3);
-		createEmpiLink(myToGoldenPatient, myTargetPatient1);
+		createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		createMdmLink(myFromGoldenPatient, myTargetPatient2);
+		createMdmLink(myFromGoldenPatient, myTargetPatient3);
+		createMdmLink(myToGoldenPatient, myTargetPatient1);
 
 		mergeGoldenPatients();
-		myEmpiLinkHelper.logEmpiLinks();
+		myMdmLinkHelper.logMdmLinks();
 
 		assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
 		assertResourceHasAutoLinkCount(myToGoldenPatient, 3);
@@ -321,37 +321,37 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 
 	private void assertResourceHasLinkCount(IBaseResource theResource, int theCount) {
-		List<EmpiLink> links = myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(theResource);
+		List<MdmLink> links = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(theResource);
 		assertEquals(theCount, links.size());
 	}
 
 	@Test
 	public void from1To123() {
-		createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		createEmpiLink(myToGoldenPatient, myTargetPatient1);
-		createEmpiLink(myToGoldenPatient, myTargetPatient2);
-		createEmpiLink(myToGoldenPatient, myTargetPatient3);
+		createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		createMdmLink(myToGoldenPatient, myTargetPatient1);
+		createMdmLink(myToGoldenPatient, myTargetPatient2);
+		createMdmLink(myToGoldenPatient, myTargetPatient3);
 
 		mergeGoldenPatients();
-		myEmpiLinkHelper.logEmpiLinks();
+		myMdmLinkHelper.logMdmLinks();
 
 		assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
 		assertResourceHasAutoLinkCount(myToGoldenPatient, 3);
 	}
 
 	private void assertResourceHasAutoLinkCount(Patient myToGoldenPatient, int theCount) {
-		List<EmpiLink> links = myEmpiLinkDaoSvc.findEmpiLinksByGoldenResource(myToGoldenPatient);
-		assertEquals(theCount, links.stream().filter(EmpiLink::isAuto).count());
+		List<MdmLink> links = myMdmLinkDaoSvc.findMdmLinksByGoldenResource(myToGoldenPatient);
+		assertEquals(theCount, links.stream().filter(MdmLink::isAuto).count());
 	}
 
 	@Test
 	public void from123To123() {
-		createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		createEmpiLink(myFromGoldenPatient, myTargetPatient2);
-		createEmpiLink(myFromGoldenPatient, myTargetPatient3);
-		createEmpiLink(myToGoldenPatient, myTargetPatient1);
-		createEmpiLink(myToGoldenPatient, myTargetPatient2);
-		createEmpiLink(myToGoldenPatient, myTargetPatient3);
+		createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		createMdmLink(myFromGoldenPatient, myTargetPatient2);
+		createMdmLink(myFromGoldenPatient, myTargetPatient3);
+		createMdmLink(myToGoldenPatient, myTargetPatient1);
+		createMdmLink(myToGoldenPatient, myTargetPatient2);
+		createMdmLink(myToGoldenPatient, myTargetPatient3);
 
 		mergeGoldenPatients();
 
@@ -362,13 +362,13 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 
 	@Test
 	public void from12To23() {
-		createEmpiLink(myFromGoldenPatient, myTargetPatient1);
-		createEmpiLink(myFromGoldenPatient, myTargetPatient2);
-		createEmpiLink(myToGoldenPatient, myTargetPatient2);
-		createEmpiLink(myToGoldenPatient, myTargetPatient3);
+		createMdmLink(myFromGoldenPatient, myTargetPatient1);
+		createMdmLink(myFromGoldenPatient, myTargetPatient2);
+		createMdmLink(myToGoldenPatient, myTargetPatient2);
+		createMdmLink(myToGoldenPatient, myTargetPatient3);
 
 		mergeGoldenPatients();
-		myEmpiLinkHelper.logEmpiLinks();
+		myMdmLinkHelper.logMdmLinks();
 
 		assertThat(myToGoldenPatient, is(possibleLinkedTo(myTargetPatient1, myTargetPatient2, myTargetPatient3)));
 
@@ -428,10 +428,10 @@ public class EmpiPersonMergerSvcTest extends BaseEmpiR4Test {
 		assertThat(myToGoldenPatient.getIdentifier(), hasSize(4));
 	}
 
-	private EmpiLink createEmpiLink(Patient theSourcePatient, Patient theTargetPatient) {
+	private MdmLink createMdmLink(Patient theSourcePatient, Patient theTargetPatient) {
 		//TODO GGG Ensure theis comment can be safely removed
 		//theSourcePatient.addLink().setTarget(new Reference(theTargetPatient));
-		return myEmpiLinkDaoSvc.createOrUpdateLinkEntity(theSourcePatient, theTargetPatient, POSSIBLE_MATCH, EmpiLinkSourceEnum.AUTO, createContextForCreate("Patient"));
+		return myMdmLinkDaoSvc.createOrUpdateLinkEntity(theSourcePatient, theTargetPatient, POSSIBLE_MATCH, MdmLinkSourceEnum.AUTO, createContextForCreate("Patient"));
 	}
 
 	private void populatePerson(Patient theSourcePatient) {
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceDaoSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java
similarity index 82%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceDaoSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java
index d6cbf58cebb..22efe0175fd 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceDaoSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
@@ -14,14 +14,14 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class EmpiResourceDaoSvcTest extends BaseEmpiR4Test {
+public class MdmResourceDaoSvcTest extends BaseMdmR4Test {
 	private static final String TEST_EID = "TEST_EID";
 	@Autowired
-	EmpiResourceDaoSvc myResourceDaoSvc;
+	MdmResourceDaoSvc myResourceDaoSvc;
 
 	@BeforeEach
 	public void before() {
-		super.loadEmpiSearchParameters();
+		super.loadMdmSearchParameters();
 	}
 
 	@Test
@@ -32,7 +32,7 @@ public class EmpiResourceDaoSvcTest extends BaseEmpiR4Test {
 
 
 		Patient badSourcePatient = addExternalEID(createRedirectedGoldenPatient(new Patient()), TEST_EID);
-		EmpiUtil.setGoldenResourceRedirected(badSourcePatient);
+		MdmUtil.setGoldenResourceRedirected(badSourcePatient);
 		myPatientDao.update(badSourcePatient);
 
 		Optional<IAnyResource> foundPerson = myResourceDaoSvc.searchGoldenResourceByEID(TEST_EID, "Patient");
@@ -41,7 +41,7 @@ public class EmpiResourceDaoSvcTest extends BaseEmpiR4Test {
 	}
 
 	@Test
-	public void testSearchPersonByEidExcludesNonEmpiManaged() {
+	public void testSearchPersonByEidExcludesNonMdmManaged() {
 		Patient goodSourcePatient = addExternalEID(createGoldenPatient(), TEST_EID);
 		myPatientDao.update(goodSourcePatient);
 
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcMockTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java
similarity index 58%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcMockTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java
index 8f73e2c21d5..155b5254058 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcMockTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -16,26 +16,27 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(SpringExtension.class)
-class EmpiResourceFilteringSvcMockTest {
+class MdmResourceFilteringSvcMockTest {
 	@MockBean
-	private IEmpiSettings myEmpiSettings;
+	private IMdmSettings myEmpiSettings;
 	@MockBean
-	EmpiSearchParamSvc myEmpiSearchParamSvc;
+	MdmSearchParamSvc myMdmSearchParamSvc;
 	@MockBean
 	FhirContext myFhirContext;
 	@Autowired
-	private EmpiResourceFilteringSvc myEmpiResourceFilteringSvc;
+	private MdmResourceFilteringSvc myMdmResourceFilteringSvc;
 
 	@Configuration
 	static class SpringConfig {
-		@Bean EmpiResourceFilteringSvc empiResourceFilteringSvc() {
-			return new EmpiResourceFilteringSvc();
+		@Bean
+		MdmResourceFilteringSvc empiResourceFilteringSvc() {
+			return new MdmResourceFilteringSvc();
 		}
 	}
 
 	@Test
 	public void testEmptyCriteriaShouldBeProcessed() {
-		when(myEmpiSettings.getEmpiRules()).thenReturn(new EmpiRulesJson());
-		assertTrue(myEmpiResourceFilteringSvc.shouldBeProcessed(new Patient()));
+		when(myEmpiSettings.getMdmRules()).thenReturn(new MdmRulesJson());
+		assertTrue(myMdmResourceFilteringSvc.shouldBeProcessed(new Patient()));
 	}
 }
diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcTest.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java
similarity index 70%
rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcTest.java
rename to hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java
index f0fbf66dca9..599782f7ab1 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiResourceFilteringSvcTest.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java
@@ -1,6 +1,6 @@
-package ca.uhn.fhir.jpa.empi.svc;
+package ca.uhn.fhir.jpa.mdm.svc;
 
-import ca.uhn.fhir.jpa.empi.BaseEmpiR4Test;
+import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
 import org.hl7.fhir.r4.model.BooleanType;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.Test;
@@ -10,10 +10,10 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-class EmpiResourceFilteringSvcTest extends BaseEmpiR4Test {
+class MdmResourceFilteringSvcTest extends BaseMdmR4Test {
 
 	@Autowired
-	private EmpiResourceFilteringSvc myEmpiResourceFilteringSvc;
+	private MdmResourceFilteringSvc myMdmResourceFilteringSvc;
 
 	@Test
 	public void testFilterResourcesWhichHaveNoRelevantAttributes() {
@@ -21,7 +21,7 @@ class EmpiResourceFilteringSvcTest extends BaseEmpiR4Test {
 		patient.setDeceased(new BooleanType(true)); //EMPI rules defined do not care about the deceased attribute.
 
 		//SUT
-		boolean shouldBeProcessed = myEmpiResourceFilteringSvc.shouldBeProcessed(patient);
+		boolean shouldBeProcessed = myMdmResourceFilteringSvc.shouldBeProcessed(patient);
 
 		assertThat(shouldBeProcessed, is(equalTo(false)));
 	}
@@ -32,7 +32,7 @@ class EmpiResourceFilteringSvcTest extends BaseEmpiR4Test {
 		patient.addIdentifier().setValue("Hey I'm an ID! rules defined in empi-rules.json care about me!");
 
 		//SUT
-		boolean shouldBeProcessed = myEmpiResourceFilteringSvc.shouldBeProcessed(patient);
+		boolean shouldBeProcessed = myMdmResourceFilteringSvc.shouldBeProcessed(patient);
 
 		assertThat(shouldBeProcessed, is(equalTo(true)));
 	}
diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
index 5b380224189..0d2ad898d7f 100644
--- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
+++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
@@ -20,10 +20,6 @@ package ca.uhn.fhir.jpa.migrate.tasks;
  * #L%
  */
 
-import ca.uhn.fhir.jpa.entity.EmpiLink;
-import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
-import ca.uhn.fhir.jpa.entity.TermConceptMap;
-import ca.uhn.fhir.jpa.entity.TermValueSet;
 import ca.uhn.fhir.jpa.migrate.DriverTypeEnum;
 import ca.uhn.fhir.jpa.migrate.taskdef.ArbitrarySqlTask;
 import ca.uhn.fhir.jpa.migrate.taskdef.CalculateHashesTask;
@@ -140,6 +136,7 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
 		empiLink.addColumn("20200715.4", "VECTOR").nullable().type(ColumnTypeEnum.LONG);
 		empiLink.addColumn("20200715.5", "SCORE").nullable().type(ColumnTypeEnum.FLOAT);
 
+
 		init510_20200725();
 
 		//EMPI Target Type
diff --git a/hapi-fhir-server-empi/pom.xml b/hapi-fhir-server-empi/pom.xml
index b9759c1dda8..e5019f76b33 100644
--- a/hapi-fhir-server-empi/pom.xml
+++ b/hapi-fhir-server-empi/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>hapi-fhir-server-empi</artifactId>
+	<artifactId>hapi-fhir-server-mdm</artifactId>
 	<packaging>jar</packaging>
 
 	<name>HAPI FHIR - Enterprise Master Patient Index</name>
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchOutcome.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchOutcome.java
deleted file mode 100644
index 4290773c7af..00000000000
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchOutcome.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package ca.uhn.fhir.empi.api;
-
-/*-
- * #%L
- * HAPI FHIR - Enterprise Master Patient Index
- * %%
- * Copyright (C) 2014 - 2020 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * This data object captures the final outcome of an EMPI match
- */
-public final class EmpiMatchOutcome {
-
-	public static final EmpiMatchOutcome POSSIBLE_DUPLICATE = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.POSSIBLE_DUPLICATE);
-	public static final EmpiMatchOutcome NO_MATCH = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.NO_MATCH);
-	public static final EmpiMatchOutcome NEW_PERSON_MATCH = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.MATCH).setNewPerson(true);
-	public static final EmpiMatchOutcome EID_MATCH = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.MATCH).setEidMatch(true);
-	public static final EmpiMatchOutcome POSSIBLE_MATCH = new EmpiMatchOutcome(null, null).setMatchResultEnum(EmpiMatchResultEnum.POSSIBLE_MATCH);
-
-	/**
-	 * A bitmap that indicates which rules matched
-	 */
-	public final Long vector;
-
-	/**
-	 * The sum of all scores for all rules evaluated.  Similarity rules add the similarity score (between 0.0 and 1.0) whereas
-	 * matcher rules add either a 0.0 or 1.0.
-	 */
-	public final Double score;
-
-	/**
-	 * Did the EMPI match operation result in creating a new Person resource?
-	 */
-	private boolean myNewPerson;
-
-	/**
-	 * Did the EMPI match occur as a result of EIDs matching?
-	 */
-	private boolean myEidMatch;
-
-	/**
-	 * Based on the EMPI Rules, what was the final match result?
-	 */
-	private EmpiMatchResultEnum myMatchResultEnum;
-
-	/**
-	 * Total number of EMPI rules checked for this outcome
-	 */
-	private int myEmpiRuleCount;
-
-	public EmpiMatchOutcome(Long theVector, Double theScore) {
-		vector = theVector;
-		score = theScore;
-	}
-
-	public boolean isMatch() {
-		return myMatchResultEnum == EmpiMatchResultEnum.MATCH;
-	}
-
-	public boolean isPossibleMatch() {
-		 return myMatchResultEnum == EmpiMatchResultEnum.POSSIBLE_MATCH;
-	}
-
-
-	public boolean isPossibleDuplicate() {
-		return myMatchResultEnum == EmpiMatchResultEnum.POSSIBLE_DUPLICATE;
-	}
-
-	public EmpiMatchResultEnum getMatchResultEnum() {
-		return myMatchResultEnum;
-	}
-
-	public EmpiMatchOutcome setMatchResultEnum(EmpiMatchResultEnum theMatchResultEnum) {
-		myMatchResultEnum = theMatchResultEnum;
-		return this;
-	}
-
-	public boolean isNewPerson() {
-		return myNewPerson;
-	}
-
-	/** @param theNewPerson	this match is creating a new person */
-	public EmpiMatchOutcome setNewPerson(boolean theNewPerson) {
-		myNewPerson = theNewPerson;
-		return this;
-	}
-
-	public boolean isEidMatch() {
-		return myEidMatch;
-	}
-
-	/**
-	 * Sets the number of EMPI rules checked for this match outcome
-	 *
-	 * @param theEmpiRuleCount
-	 * 	Number of EMPI rules that were checked for this match outcome
-	 * @return
-	 * 	Returns this instance
-	 */
-	public EmpiMatchOutcome setEmpiRuleCount(int theEmpiRuleCount) {
-		myEmpiRuleCount = theEmpiRuleCount;
-		return this;
-	}
-
-	/**
-	 * Gets the number of EMPI rules checked for this match outcome
-	 *
-	 * @return
-	 * 	Returns the number of rules
-	 */
-	public int getEmpiRuleCount() {
-		return myEmpiRuleCount;
-	}
-
-	/** @param theEidMatch the link was established via a shared EID */
-	public EmpiMatchOutcome setEidMatch(boolean theEidMatch) {
-		myEidMatch = theEidMatch;
-		return this;
-	}
-
-	/**
-	 * Gets normalized score that is in the range from zero to one
-	 *
-	 * @return
-	 * 	Returns the normalized score
-	 */
-	public Double getNormalizedScore() {
-		if (myEmpiRuleCount == 0) {
-			return 0.0;
-		}
-		return score / myEmpiRuleCount;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this)
-			.append("vector", vector)
-			.append("score", score)
-			.append("myNewPerson", myNewPerson)
-			.append("myEidMatch", myEidMatch)
-			.append("myMatchResultEnum", myMatchResultEnum)
-			.toString();
-	}
-}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IGoldenResourceMergerSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java
similarity index 94%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IGoldenResourceMergerSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java
index 229afba0a07..ff47c6b5332 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IGoldenResourceMergerSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 
 public interface IGoldenResourceMergerSvc {
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java
similarity index 77%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java
index 188e814d9ae..0ab3fb8a310 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -22,12 +22,12 @@ package ca.uhn.fhir.empi.api;
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
-public interface IEmpiChannelSubmitterSvc {
+public interface IMdmChannelSubmitterSvc {
 
 	/**
-	 * Given an IBaseResource, submit it to the EMPI channel for processing.
+	 * Given an IBaseResource, submit it to the MDM channel for processing.
 	 *
-	 * @param theResource the {@link IBaseResource} that should have EMPI processing applied to it.
+	 * @param theResource the {@link IBaseResource} that should have MDM processing applied to it.
 	 */
-	void submitResourceToEmpiChannel(IBaseResource theResource);
+	void submitResourceToMdmChannel(IBaseResource theResource);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiControllerSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java
similarity index 65%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiControllerSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java
index f960e120a60..27c09170e09 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiControllerSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,16 +20,21 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 
 import javax.annotation.Nullable;
 import java.util.stream.Stream;
 
-public interface IEmpiControllerSvc {
-	Stream<EmpiLinkJson> queryLinks(@Nullable String thePersonId, @Nullable String theTargetId, @Nullable String theMatchResult, @Nullable String theLinkSource, MdmTransactionContext theEmpiContext);
-	Stream<EmpiLinkJson> getDuplicateGoldenResources(MdmTransactionContext theEmpiContext);
-	void notDuplicateGoldenResource(String thePersonId, String theTargetPersonId, MdmTransactionContext theEmpiContext);
+public interface IMdmControllerSvc {
+
+	Stream<MdmLinkJson> queryLinks(@Nullable String thePersonId, @Nullable String theTargetId, @Nullable String theMatchResult, @Nullable String theLinkSource, MdmTransactionContext theMdmTransactionContext);
+
+	Stream<MdmLinkJson> getDuplicateGoldenResources(MdmTransactionContext theMdmTransactionContext);
+
+	void notDuplicateGoldenResource(String thePersonId, String theTargetPersonId, MdmTransactionContext theMdmTransactionContext);
+
 	IAnyResource mergeGoldenResources(String theFromPersonId, String theToPersonId, MdmTransactionContext theMdmTransactionContext);
-	IAnyResource updateLink(String thePersonId, String theTargetId, String theMatchResult, MdmTransactionContext theEmpiContext);
+
+	IAnyResource updateLink(String thePersonId, String theTargetId, String theMatchResult, MdmTransactionContext theMdmTransactionContext);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiExpungeSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java
similarity index 72%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiExpungeSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java
index 9ff8b373e5b..cd7fb9412f0 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiExpungeSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -22,24 +22,24 @@ package ca.uhn.fhir.empi.api;
 
 import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
 
-public interface IEmpiExpungeSvc {
+public interface IMdmExpungeSvc {
 
 	/**
-	 * Given a resource type, delete the underlying EMPI links, and their related person objects.
+	 * Given a resource type, delete the underlying MDM links, and their related person objects.
 	 *
 	 * @param theResourceType The type of resources
 	 *
 	 * @param theRequestDetails
-	 * @return the count of deleted EMPI links
+	 * @return the count of deleted MDM links
 	 */
 	long expungeAllMdmLinksOfTargetType(String theResourceType, ServletRequestDetails theRequestDetails);
 
 	/**
-	 * Delete all EMPI links, and their related Person objects.
+	 * Delete all MDM links, and their related Person objects.
 	 *
 	 *
-	 * @return the count of deleted EMPI links
+	 * @return the count of deleted MDM links
 	 * @param theRequestDetails
 	 */
-	long expungeAllEmpiLinks(ServletRequestDetails theRequestDetails);
+	long expungeAllMdmLinks(ServletRequestDetails theRequestDetails);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkQuerySvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java
similarity index 69%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkQuerySvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java
index aa1feab7139..a9ec86ff6e3 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkQuerySvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import org.hl7.fhir.instance.model.api.IIdType;
 
 import java.util.stream.Stream;
@@ -28,7 +28,7 @@ import java.util.stream.Stream;
 /**
  * This service supports the EMPI Operation providers for those services that return multiple empi links.
  */
-public interface IEmpiLinkQuerySvc {
-	Stream<EmpiLinkJson> queryLinks(IIdType thePersonId, IIdType theTargetId, EmpiMatchResultEnum theMatchResult, EmpiLinkSourceEnum theLinkSource, MdmTransactionContext theEmpiContext);
-	Stream<EmpiLinkJson> getDuplicatePersons(MdmTransactionContext theEmpiContext);
+public interface IMdmLinkQuerySvc {
+	Stream<MdmLinkJson> queryLinks(IIdType thePersonId, IIdType theTargetId, MdmMatchResultEnum theMatchResult, MdmLinkSourceEnum theLinkSource, MdmTransactionContext theEmpiContext);
+	Stream<MdmLinkJson> getDuplicatePersons(MdmTransactionContext theEmpiContext);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java
similarity index 75%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java
index 63fd179ac18..3fd76403a19 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,10 +20,10 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 
-public interface IEmpiLinkSvc {
+public interface IMdmLinkSvc {
 
 	/**
 	 * Update a link between a Person record and its target Patient/Practitioner record. If a link does not exist between
@@ -34,13 +34,7 @@ public interface IEmpiLinkSvc {
 	 * @param theLinkSource             MANUAL or AUTO: what caused the link.
 	 * @param theMdmTransactionContext
 	 */
-	void updateLink(IAnyResource thePerson, IAnyResource theTargetResource, EmpiMatchOutcome theMatchResult, EmpiLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext);
-
-//	/**
-//	 * Replace Person.link values from what they should be based on EmpiLink values
-//	 * @param thePersonResource the person to correct the links on.
-//	 */
-//	void syncEmpiLinksToPersonLinks(IAnyResource thePersonResource, EmpiTransactionContext theEmpiTransactionContext);
+	void updateLink(IAnyResource thePerson, IAnyResource theTargetResource, MdmMatchOutcome theMatchResult, MdmLinkSourceEnum theLinkSource, MdmTransactionContext theMdmTransactionContext);
 
 	/**
 	 * Delete a link between given Person and target patient/practitioner
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkUpdaterSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java
similarity index 81%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkUpdaterSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java
index ca0e8aae6da..7b0da04df27 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiLinkUpdaterSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,10 +20,10 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 
-public interface IEmpiLinkUpdaterSvc {
-	IAnyResource updateLink(IAnyResource thePerson, IAnyResource theTarget, EmpiMatchResultEnum theMatchResult, MdmTransactionContext theEmpiContext);
+public interface IMdmLinkUpdaterSvc {
+	IAnyResource updateLink(IAnyResource thePerson, IAnyResource theTarget, MdmMatchResultEnum theMatchResult, MdmTransactionContext theEmpiContext);
 	void notDuplicatePerson(IAnyResource thePerson, IAnyResource theTarget, MdmTransactionContext theEmpiContext);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiMatchFinderSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java
similarity index 89%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiMatchFinderSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java
index 5f13698c159..4ed03f0f36d 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiMatchFinderSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -25,10 +25,10 @@ import org.hl7.fhir.instance.model.api.IAnyResource;
 import javax.annotation.Nonnull;
 import java.util.List;
 
-public interface IEmpiMatchFinderSvc {
+public interface IMdmMatchFinderSvc {
 	/**
 	 * Retrieve a list of possible Patient/Practitioner candidates for matching, based on the given {@link IAnyResource}
-	 * Internally, performs all EMPI matching rules on the type of the resource.
+	 * Internally, performs all MDM matching rules on the type of the resource.
 	 *
 	 * @param theResourceType the type of the resource.
 	 * @param theResource the resource that we are attempting to find matches for.
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiRuleValidator.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java
similarity index 81%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiRuleValidator.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java
index 69a0c5095c8..b944c6ebdda 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiRuleValidator.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,8 +20,8 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 
-public interface IEmpiRuleValidator {
-	void validate(EmpiRulesJson theEmpiRules);
+public interface IMdmRuleValidator {
+	void validate(MdmRulesJson theMdmRules);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiSettings.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java
similarity index 68%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiSettings.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java
index 9a742809c13..6362ca5522c 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiSettings.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,20 +20,20 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 
 import java.util.stream.Collectors;
 
-public interface IEmpiSettings {
-	String EMPI_CHANNEL_NAME = "empi";
-	// Parallel processing of EMPI can result in missed matches.  Best to single-thread.
-	int EMPI_DEFAULT_CONCURRENT_CONSUMERS = 1;
+public interface IMdmSettings {
+	String MDM_CHANNEL_NAME = "empi";
+	// Parallel processing of MDM can result in missed matches.  Best to single-thread.
+	int MDM_DEFAULT_CONCURRENT_CONSUMERS = 1;
 
 	boolean isEnabled();
 
 	int getConcurrentConsumers();
 
-	EmpiRulesJson getEmpiRules();
+	MdmRulesJson getMdmRules();
 
 	boolean isPreventEidUpdates();
 
@@ -42,10 +42,10 @@ public interface IEmpiSettings {
 	String getRuleVersion();
 
 	default boolean isSupportedMdmType(String theResourceName) {
-		return getEmpiRules().getMdmTypes().contains(theResourceName);
+		return getMdmRules().getMdmTypes().contains(theResourceName);
 	}
 
 	default String getSupportedMdmTypes() {
-		return getEmpiRules().getMdmTypes().stream().collect(Collectors.joining(", "));
+		return getMdmRules().getMdmTypes().stream().collect(Collectors.joining(", "));
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiSubmitSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java
similarity index 58%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiSubmitSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java
index b193a12d0e0..4ec907275f9 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiSubmitSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -24,49 +24,49 @@ import org.hl7.fhir.instance.model.api.IIdType;
 
 import javax.annotation.Nullable;
 
-public interface IEmpiSubmitSvc {
+public interface IMdmSubmitSvc {
 
 	/**
-	 * Submit all eligible resources for EMPI processing.
-	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for EMPI processing.
+	 * Submit all eligible resources for MDM processing.
+	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for MDM processing.
 	 *                    NOTE:
-	 *                    When using this function, the criteria supplied must be valid for all EMPI types. e.g. , if you
+	 *                    When using this function, the criteria supplied must be valid for all MDM types. e.g. , if you
 	 *                    run this with the criteria birthDate=1990-06-28, it will fail, as Practitioners do not have a birthday.
 	 *                    Use with caution.
 	 *
 	 * @return
 	 */
-	long submitAllTargetTypesToEmpi(@Nullable String theCriteria);
+	long submitAllTargetTypesToMdm(@Nullable String theCriteria);
 
 	/**
-	 * Given a type and a search criteria, submit all found resources for EMPI processing.
+	 * Given a type and a search criteria, submit all found resources for MDM processing.
 	 *
-	 * @param theTargetType the resource type that you wish to execute a search over for submission to EMPI.
-	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for EMPI processing..
-	 * @return the number of resources submitted for EMPI processing.
+	 * @param theTargetType the resource type that you wish to execute a search over for submission to MDM.
+	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for MDM processing..
+	 * @return the number of resources submitted for MDM processing.
 	 */
-	long submitTargetTypeToEmpi(String theTargetType, String theCriteria);
+	long submitTargetTypeToMdm(String theTargetType, String theCriteria);
 
 	/**
-	 * Convenience method that calls {@link #submitTargetTypeToEmpi(String, String)} with the type pre-populated.
+	 * Convenience method that calls {@link #submitTargetTypeToMdm(String, String)} with the type pre-populated.
 	 *
-	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for EMPI processing.
-	 * @return the number of resources submitted for EMPI processing.
+	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for MDM processing.
+	 * @return the number of resources submitted for MDM processing.
 	 */
 	long submitPractitionerTypeToMdm(String theCriteria);
 
 	/**
-	 * Convenience method that calls {@link #submitTargetTypeToEmpi(String, String)} with the type pre-populated.
+	 * Convenience method that calls {@link #submitTargetTypeToMdm(String, String)} with the type pre-populated.
 	 *
-	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for EMPI processing.
-	 * @return the number of resources submitted for EMPI processing.
+	 * @param theCriteria The FHIR search critieria for filtering the resources to be submitted for MDM processing.
+	 * @return the number of resources submitted for MDM processing.
 	 */
 	long submitPatientTypeToMdm(String theCriteria);
 
 	/**
-	 * Given an ID and a target type valid for EMPI, manually submit the given ID for EMPI processing.
-	 * @param theId the ID of the resource to process for EMPI.
-	 * @return the constant `1`, as if this function returns successfully, it will have processed one resource for EMPI.
+	 * Given an ID and a target type valid for MDM, manually submit the given ID for MDM processing.
+	 * @param theId the ID of the resource to process for MDM.
+	 * @return the constant `1`, as if this function returns successfully, it will have processed one resource for MDM.
 	 */
 	long submitTargetToMdm(IIdType theId);
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/MatchedTarget.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java
similarity index 84%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/MatchedTarget.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java
index c709280f6f7..c07bd3aff06 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/MatchedTarget.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -25,9 +25,9 @@ import org.hl7.fhir.instance.model.api.IAnyResource;
 public class MatchedTarget {
 
 	private final IAnyResource myTarget;
-	private final EmpiMatchOutcome myMatchResult;
+	private final MdmMatchOutcome myMatchResult;
 
-	public MatchedTarget(IAnyResource theTarget, EmpiMatchOutcome theMatchResult) {
+	public MatchedTarget(IAnyResource theTarget, MdmMatchOutcome theMatchResult) {
 		myTarget = theTarget;
 		myMatchResult = theMatchResult;
 	}
@@ -36,7 +36,7 @@ public class MatchedTarget {
 		return myTarget;
 	}
 
-	public EmpiMatchOutcome getMatchResult() {
+	public MdmMatchOutcome getMatchResult() {
 		return myMatchResult;
 	}
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiConstants.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java
similarity index 81%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiConstants.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java
index 05d9dbcf937..eb87ff629d2 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiConstants.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,16 +20,16 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-public class EmpiConstants {
+public class MdmConstants {
 	/**
-	 * TAG system for Person resources which are managed by HAPI EMPI.
+	 * TAG system for Person resources which are managed by HAPI MDM.
 	 */
 
 	public static final String SYSTEM_MDM_MANAGED = "https://hapifhir.org/NamingSystem/managing-mdm-system";
 	public static final String CODE_HAPI_MDM_MANAGED = "HAPI-MDM";
-	public static final String DISPLAY_HAPI_EMPI_MANAGED = "This Person can only be modified by Smile CDR's EMPI system.";
-	public static final String CODE_NO_EMPI_MANAGED = "NO-EMPI";
-	public static final String HAPI_ENTERPRISE_IDENTIFIER_SYSTEM = "http://hapifhir.io/fhir/NamingSystem/empi-person-enterprise-id";
+	public static final String DISPLAY_HAPI_MDM_MANAGED = "This Person can only be modified by Smile CDR's MDM system.";
+	public static final String CODE_NO_MDM_MANAGED = "NO-MDM";
+	public static final String HAPI_ENTERPRISE_IDENTIFIER_SYSTEM = "http://hapifhir.io/fhir/NamingSystem/mdm-golden-resource-enterprise-id";
 	public static final String ALL_RESOURCE_SEARCH_PARAM_TYPE = "*";
 
 	public static final String FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE = "http://hl7.org/fhir/StructureDefinition/match-grade";
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiLinkJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java
similarity index 74%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiLinkJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java
index d2c511b9a78..72be8a25edc 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiLinkJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Date;
 
-public class EmpiLinkJson implements IModelJson {
+public class MdmLinkJson implements IModelJson {
 	@JsonProperty("goldenResourceId")
 	private String myGoldenResourceId;
 
@@ -33,10 +33,10 @@ public class EmpiLinkJson implements IModelJson {
 	private String myTargetId;
 
 	@JsonProperty("matchResult")
-	private EmpiMatchResultEnum myMatchResult;
+	private MdmMatchResultEnum myMatchResult;
 
 	@JsonProperty("linkSource")
-	private EmpiLinkSourceEnum myLinkSource;
+	private MdmLinkSourceEnum myLinkSource;
 
 	@JsonProperty("created")
 	private Date myCreated;
@@ -65,7 +65,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myGoldenResourceId;
 	}
 
-	public EmpiLinkJson setGoldenResourceId(String theGoldenResourceId) {
+	public MdmLinkJson setGoldenResourceId(String theGoldenResourceId) {
 		myGoldenResourceId = theGoldenResourceId;
 		return this;
 	}
@@ -74,25 +74,25 @@ public class EmpiLinkJson implements IModelJson {
 		return myTargetId;
 	}
 
-	public EmpiLinkJson setTargetId(String theTargetId) {
+	public MdmLinkJson setTargetId(String theTargetId) {
 		myTargetId = theTargetId;
 		return this;
 	}
 
-	public EmpiMatchResultEnum getMatchResult() {
+	public MdmMatchResultEnum getMatchResult() {
 		return myMatchResult;
 	}
 
-	public EmpiLinkJson setMatchResult(EmpiMatchResultEnum theMatchResult) {
+	public MdmLinkJson setMatchResult(MdmMatchResultEnum theMatchResult) {
 		myMatchResult = theMatchResult;
 		return this;
 	}
 
-	public EmpiLinkSourceEnum getLinkSource() {
+	public MdmLinkSourceEnum getLinkSource() {
 		return myLinkSource;
 	}
 
-	public EmpiLinkJson setLinkSource(EmpiLinkSourceEnum theLinkSource) {
+	public MdmLinkJson setLinkSource(MdmLinkSourceEnum theLinkSource) {
 		myLinkSource = theLinkSource;
 		return this;
 	}
@@ -101,7 +101,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myCreated;
 	}
 
-	public EmpiLinkJson setCreated(Date theCreated) {
+	public MdmLinkJson setCreated(Date theCreated) {
 		myCreated = theCreated;
 		return this;
 	}
@@ -110,7 +110,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myUpdated;
 	}
 
-	public EmpiLinkJson setUpdated(Date theUpdated) {
+	public MdmLinkJson setUpdated(Date theUpdated) {
 		myUpdated = theUpdated;
 		return this;
 	}
@@ -119,7 +119,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myVersion;
 	}
 
-	public EmpiLinkJson setVersion(String theVersion) {
+	public MdmLinkJson setVersion(String theVersion) {
 		myVersion = theVersion;
 		return this;
 	}
@@ -128,7 +128,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myEidMatch;
 	}
 
-	public EmpiLinkJson setEidMatch(Boolean theEidMatch) {
+	public MdmLinkJson setEidMatch(Boolean theEidMatch) {
 		myEidMatch = theEidMatch;
 		return this;
 	}
@@ -137,7 +137,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myLinkCreatedNewResource;
 	}
 
-	public EmpiLinkJson setLinkCreatedNewResource(Boolean theLinkCreatedNewResource) {
+	public MdmLinkJson setLinkCreatedNewResource(Boolean theLinkCreatedNewResource) {
 		myLinkCreatedNewResource = theLinkCreatedNewResource;
 		return this;
 	}
@@ -146,7 +146,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myVector;
 	}
 
-	public EmpiLinkJson setVector(Long theVector) {
+	public MdmLinkJson setVector(Long theVector) {
 		myVector = theVector;
 		return this;
 	}
@@ -155,7 +155,7 @@ public class EmpiLinkJson implements IModelJson {
 		return myScore;
 	}
 
-	public EmpiLinkJson setScore(Double theScore) {
+	public MdmLinkJson setScore(Double theScore) {
 		myScore = theScore;
 		return this;
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiLinkSourceEnum.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java
similarity index 93%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiLinkSourceEnum.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java
index f763896f0a5..ad5d99a6bab 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiLinkSourceEnum.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-public enum EmpiLinkSourceEnum {
+public enum MdmLinkSourceEnum {
 	/**
 	 * Link was created or last modified by an algorithm
 	 */
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchEvaluation.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java
similarity index 70%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchEvaluation.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java
index cfa988ba7bd..35a61a3cecc 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchEvaluation.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,16 +20,16 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-public class EmpiMatchEvaluation {
+public class MdmMatchEvaluation {
 	public final boolean match;
 	public final double score;
 
-	public EmpiMatchEvaluation(boolean theMatch, double theScore) {
+	public MdmMatchEvaluation(boolean theMatch, double theScore) {
 		match = theMatch;
 		score = theScore;
 	}
 
-	public static EmpiMatchEvaluation max(EmpiMatchEvaluation theLeft, EmpiMatchEvaluation theRight) {
-		return new EmpiMatchEvaluation(theLeft.match | theRight.match, Math.max(theLeft.score, theRight.score));
+	public static MdmMatchEvaluation max(MdmMatchEvaluation theLeft, MdmMatchEvaluation theRight) {
+		return new MdmMatchEvaluation(theLeft.match | theRight.match, Math.max(theLeft.score, theRight.score));
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java
new file mode 100644
index 00000000000..ddb5b7f30a0
--- /dev/null
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java
@@ -0,0 +1,160 @@
+package ca.uhn.fhir.mdm.api;
+
+/*-
+ * #%L
+ * HAPI FHIR - Enterprise Master Patient Index
+ * %%
+ * Copyright (C) 2014 - 2020 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * This data object captures the final outcome of an MDM match
+ */
+public final class MdmMatchOutcome {
+
+	public static final MdmMatchOutcome POSSIBLE_DUPLICATE = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.POSSIBLE_DUPLICATE);
+	public static final MdmMatchOutcome NO_MATCH = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.NO_MATCH);
+	public static final MdmMatchOutcome NEW_PERSON_MATCH = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.MATCH).setCreatedNewResource(true);
+	public static final MdmMatchOutcome EID_MATCH = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.MATCH).setEidMatch(true);
+	public static final MdmMatchOutcome POSSIBLE_MATCH = new MdmMatchOutcome(null, null).setMatchResultEnum(MdmMatchResultEnum.POSSIBLE_MATCH);
+
+	/**
+	 * A bitmap that indicates which rules matched
+	 */
+	public final Long vector;
+
+	/**
+	 * The sum of all scores for all rules evaluated.  Similarity rules add the similarity score (between 0.0 and 1.0) whereas
+	 * matcher rules add either a 0.0 or 1.0.
+	 */
+	public final Double score;
+
+	/**
+	 * Did the MDM match operation result in creating a new Person resource?
+	 */
+	private boolean myCreatedNewResource;
+
+	/**
+	 * Did the MDM match occur as a result of EIDs matching?
+	 */
+	private boolean myEidMatch;
+
+	/**
+	 * Based on the MDM Rules, what was the final match result?
+	 */
+	private MdmMatchResultEnum myMatchResultEnum;
+
+	/**
+	 * Total number of MDM rules checked for this outcome
+	 */
+	private int myMdmRuleCount;
+
+	public MdmMatchOutcome(Long theVector, Double theScore) {
+		vector = theVector;
+		score = theScore;
+	}
+
+	public boolean isMatch() {
+		return myMatchResultEnum == MdmMatchResultEnum.MATCH;
+	}
+
+	public boolean isPossibleMatch() {
+		 return myMatchResultEnum == MdmMatchResultEnum.POSSIBLE_MATCH;
+	}
+
+
+	public boolean isPossibleDuplicate() {
+		return myMatchResultEnum == MdmMatchResultEnum.POSSIBLE_DUPLICATE;
+	}
+
+	public MdmMatchResultEnum getMatchResultEnum() {
+		return myMatchResultEnum;
+	}
+
+	public MdmMatchOutcome setMatchResultEnum(MdmMatchResultEnum theMatchResultEnum) {
+		myMatchResultEnum = theMatchResultEnum;
+		return this;
+	}
+
+	public boolean isCreatedNewResource() {
+		return myCreatedNewResource;
+	}
+
+	/** @param theCreatedNewResource	this match is creating a new person */
+	public MdmMatchOutcome setCreatedNewResource(boolean theCreatedNewResource) {
+		myCreatedNewResource = theCreatedNewResource;
+		return this;
+	}
+
+	public boolean isEidMatch() {
+		return myEidMatch;
+	}
+
+	/**
+	 * Sets the number of MDM rules checked for this match outcome
+	 *
+	 * @param theEmpiRuleCount
+	 * 	Number of MDM rules that were checked for this match outcome
+	 * @return
+	 * 	Returns this instance
+	 */
+	public MdmMatchOutcome setMdmRuleCount(int theEmpiRuleCount) {
+		myMdmRuleCount = theEmpiRuleCount;
+		return this;
+	}
+
+	/**
+	 * Gets the number of MDM rules checked for this match outcome
+	 *
+	 * @return
+	 * 	Returns the number of rules
+	 */
+	public int getMdmRuleCount() {
+		return myMdmRuleCount;
+	}
+
+	/** @param theEidMatch the link was established via a shared EID */
+	public MdmMatchOutcome setEidMatch(boolean theEidMatch) {
+		myEidMatch = theEidMatch;
+		return this;
+	}
+
+	/**
+	 * Gets normalized score that is in the range from zero to one
+	 *
+	 * @return
+	 * 	Returns the normalized score
+	 */
+	public Double getNormalizedScore() {
+		if (myMdmRuleCount == 0) {
+			return 0.0;
+		}
+		return score / myMdmRuleCount;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this)
+			.append("vector", vector)
+			.append("score", score)
+			.append("myNewPerson", myCreatedNewResource)
+			.append("myEidMatch", myEidMatch)
+			.append("myMatchResultEnum", myMatchResultEnum)
+			.toString();
+	}
+}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchResultEnum.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java
similarity index 95%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchResultEnum.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java
index 1626e780581..8629109e292 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/EmpiMatchResultEnum.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.api;
  * #L%
  */
 
-public enum EmpiMatchResultEnum {
+public enum MdmMatchResultEnum {
 	/**
 	 * Manually confirmed to not be a match.
 	 */
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/log/Logs.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/log/Logs.java
similarity index 76%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/log/Logs.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/log/Logs.java
index 77f4215b1ec..64381bf70e7 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/log/Logs.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/log/Logs.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.log;
+package ca.uhn.fhir.mdm.log;
 
 /*-
  * #%L
@@ -24,9 +24,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class Logs {
-	private static final Logger ourEmpiTroubleshootingLog = LoggerFactory.getLogger("ca.uhn.fhir.log.empi_troubleshooting");
+	private static final Logger ourMdmTroubleshootingLog = LoggerFactory.getLogger("ca.uhn.fhir.log.mdm_troubleshooting");
 
-	public static Logger getEmpiTroubleshootingLog() {
-		return ourEmpiTroubleshootingLog;
+	public static Logger getMdmTroubleshootingLog() {
+		return ourMdmTroubleshootingLog;
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/CanonicalEID.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java
similarity index 99%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/CanonicalEID.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java
index 55d6f5111fc..4107726e780 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/CanonicalEID.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.model;
+package ca.uhn.fhir.mdm.model;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/CanonicalIdentityAssuranceLevel.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java
similarity index 97%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/CanonicalIdentityAssuranceLevel.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java
index a619ff14c0d..1515cb1912d 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/CanonicalIdentityAssuranceLevel.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.model;
+package ca.uhn.fhir.mdm.model;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/MdmTransactionContext.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java
similarity index 97%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/MdmTransactionContext.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java
index 3f19732dd61..ed23d092d11 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/model/MdmTransactionContext.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.model;
+package ca.uhn.fhir.mdm.model;
 
 /*-
  * #%L
@@ -27,7 +27,7 @@ public class MdmTransactionContext {
 	public enum OperationType {
 		CREATE_RESOURCE,
 		UPDATE_RESOURCE,
-		SUBMIT_RESOURCE_TO_EMPI,
+		SUBMIT_RESOURCE_TO_MDM,
 		QUERY_LINKS,
 		UPDATE_LINK,
 		DUPLICATE_GOLDEN_RESOURCES,
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/BaseEmpiProvider.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java
similarity index 82%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/BaseEmpiProvider.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java
index 9fd42ac5c1a..9d0d71d8e0d 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/BaseEmpiProvider.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.provider;
+package ca.uhn.fhir.mdm.provider;
 
 /*-
  * #%L
@@ -21,9 +21,9 @@ package ca.uhn.fhir.empi.provider;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiLinkJson;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.MdmLinkJson;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.server.TransactionLogMessages;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
@@ -35,11 +35,11 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import java.util.stream.Stream;
 
-public abstract class BaseEmpiProvider {
+public abstract class BaseMdmProvider {
 
 	protected final FhirContext myFhirContext;
 
-	public BaseEmpiProvider(FhirContext theFhirContext) {
+	public BaseMdmProvider(FhirContext theFhirContext) {
 		myFhirContext = theFhirContext;
 	}
 
@@ -63,14 +63,14 @@ public abstract class BaseEmpiProvider {
 		validateNotNull(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, theGoldenResourceId);
 		validateNotNull(ProviderConstants.MDM_UPDATE_LINK_RESOURCE_ID, theResourceId);
 		validateNotNull(ProviderConstants.MDM_UPDATE_LINK_MATCH_RESULT, theMatchResult);
-		EmpiMatchResultEnum matchResult = EmpiMatchResultEnum.valueOf(theMatchResult.getValue());
+		MdmMatchResultEnum matchResult = MdmMatchResultEnum.valueOf(theMatchResult.getValue());
 		switch (matchResult) {
 			case NO_MATCH:
 			case MATCH:
 				break;
 			default:
 				throw new InvalidRequestException(ProviderConstants.MDM_UPDATE_LINK + " illegal " + ProviderConstants.MDM_UPDATE_LINK_MATCH_RESULT +
-					" value '" + matchResult + "'.  Must be " + EmpiMatchResultEnum.NO_MATCH + " or " + EmpiMatchResultEnum.MATCH);
+					" value '" + matchResult + "'.  Must be " + MdmMatchResultEnum.NO_MATCH + " or " + MdmMatchResultEnum.MATCH);
 		}
 	}
 
@@ -94,20 +94,20 @@ public abstract class BaseEmpiProvider {
 		return theString.getValue();
 	}
 
-	protected IBaseParameters parametersFromEmpiLinks(Stream<EmpiLinkJson> theEmpiLinkStream, boolean includeResultAndSource) {
+	protected IBaseParameters parametersFromMdmLinks(Stream<MdmLinkJson> theMdmLinkStream, boolean includeResultAndSource) {
 		IBaseParameters retval = ParametersUtil.newInstance(myFhirContext);
 
-		theEmpiLinkStream.forEach(empiLink -> {
+		theMdmLinkStream.forEach(mdmLink -> {
 			IBase resultPart = ParametersUtil.addParameterToParameters(myFhirContext, retval, "link");
-			ParametersUtil.addPartString(myFhirContext, resultPart, "goldenResourceId", empiLink.getGoldenResourceId());
-			ParametersUtil.addPartString(myFhirContext, resultPart, "targetResourceId", empiLink.getTargetId());
+			ParametersUtil.addPartString(myFhirContext, resultPart, "goldenResourceId", mdmLink.getGoldenResourceId());
+			ParametersUtil.addPartString(myFhirContext, resultPart, "targetResourceId", mdmLink.getTargetId());
 
 			if (includeResultAndSource) {
-				ParametersUtil.addPartString(myFhirContext, resultPart, "matchResult", empiLink.getMatchResult().name());
-				ParametersUtil.addPartString(myFhirContext, resultPart, "linkSource", empiLink.getLinkSource().name());
-				ParametersUtil.addPartBoolean(myFhirContext, resultPart, "eidMatch", empiLink.getEidMatch());
-				ParametersUtil.addPartBoolean(myFhirContext, resultPart, "hadToCreateNewResource", empiLink.getLinkCreatedNewResource());
-				ParametersUtil.addPartDecimal(myFhirContext, resultPart, "score", empiLink.getScore());
+				ParametersUtil.addPartString(myFhirContext, resultPart, "matchResult", mdmLink.getMatchResult().name());
+				ParametersUtil.addPartString(myFhirContext, resultPart, "linkSource", mdmLink.getLinkSource().name());
+				ParametersUtil.addPartBoolean(myFhirContext, resultPart, "eidMatch", mdmLink.getEidMatch());
+				ParametersUtil.addPartBoolean(myFhirContext, resultPart, "hadToCreateNewResource", mdmLink.getLinkCreatedNewResource());
+				ParametersUtil.addPartDecimal(myFhirContext, resultPart, "score", mdmLink.getScore());
 			}
 		});
 		return retval;
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiControllerHelper.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java
similarity index 81%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiControllerHelper.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java
index 358dcfdddc3..9e258c4e697 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiControllerHelper.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.provider;
+package ca.uhn.fhir.mdm.provider;
 
 /*-
  * #%L
@@ -21,10 +21,9 @@ package ca.uhn.fhir.empi.provider;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.util.EmpiUtil;
-import ca.uhn.fhir.empi.util.MessageHelper;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.util.MdmUtil;
+import ca.uhn.fhir.mdm.util.MessageHelper;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException;
@@ -36,20 +35,15 @@ import org.hl7.fhir.instance.model.api.IIdType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.stream.Collectors;
-
 @Service
-public class EmpiControllerHelper {
+public class MdmControllerHelper {
 	private final FhirContext myFhirContext;
 	private final IResourceLoader myResourceLoader;
-	private final IEmpiSettings myEmpiSettings;
+	private final IMdmSettings myEmpiSettings;
 	private final MessageHelper myMessageHelper;
 
 	@Autowired
-	public EmpiControllerHelper(FhirContext theFhirContext, IResourceLoader theResourceLoader, IEmpiSettings theEmpiSettings, MessageHelper theMessageHelper) {
+	public MdmControllerHelper(FhirContext theFhirContext, IResourceLoader theResourceLoader, IMdmSettings theEmpiSettings, MessageHelper theMessageHelper) {
 		myFhirContext = theFhirContext;
 		myResourceLoader = theResourceLoader;
 		myEmpiSettings = theEmpiSettings;
@@ -68,13 +62,13 @@ public class EmpiControllerHelper {
 	}
 
 	public IAnyResource getLatestGoldenResourceFromIdOrThrowException(String theParamName, String theGoldenResourceId) {
-		IdDt resourceId = EmpiControllerUtil.getGoldenIdDtOrThrowException(theParamName, theGoldenResourceId);
+		IdDt resourceId = MdmControllerUtil.getGoldenIdDtOrThrowException(theParamName, theGoldenResourceId);
 		return loadResource(resourceId.toUnqualifiedVersionless());
 	}
 
 
 	public IAnyResource getLatestTargetFromIdOrThrowException(String theParamName, String theId) {
-		IIdType targetId = EmpiControllerUtil.getTargetIdDtOrThrowException(theParamName, theId);
+		IIdType targetId = MdmControllerUtil.getTargetIdDtOrThrowException(theParamName, theId);
 		return loadResource(targetId.toUnqualifiedVersionless());
 	}
 
@@ -100,7 +94,7 @@ public class EmpiControllerHelper {
 			);
 		}
 
-		if (!EmpiUtil.isEmpiManaged(theResource)) {
+		if (!MdmUtil.isMdmManaged(theResource)) {
 			throw new InvalidRequestException(myMessageHelper.getMessageForUnmanagedResource());
 		}
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiControllerUtil.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java
similarity index 83%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiControllerUtil.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java
index eae44dcb07a..cbd720331c8 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiControllerUtil.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.provider;
+package ca.uhn.fhir.mdm.provider;
 
 /*-
  * #%L
@@ -20,25 +20,25 @@ package ca.uhn.fhir.empi.provider;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import org.hl7.fhir.instance.model.api.IIdType;
 
-public class EmpiControllerUtil {
-	public static EmpiMatchResultEnum extractMatchResultOrNull(String theMatchResult) {
+public class MdmControllerUtil {
+	public static MdmMatchResultEnum extractMatchResultOrNull(String theMatchResult) {
 		if (theMatchResult == null) {
 			return null;
 		}
-		return EmpiMatchResultEnum.valueOf(theMatchResult);
+		return MdmMatchResultEnum.valueOf(theMatchResult);
 	}
 
-	public static EmpiLinkSourceEnum extractLinkSourceOrNull(String theLinkSource) {
+	public static MdmLinkSourceEnum extractLinkSourceOrNull(String theLinkSource) {
 		if (theLinkSource == null) {
 			return null;
 		}
-		return EmpiLinkSourceEnum.valueOf(theLinkSource);
+		return MdmLinkSourceEnum.valueOf(theLinkSource);
 	}
 
 	public static IIdType extractPersonIdDtOrNull(String theName, String thePersonId) {
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderDstu3.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java
similarity index 81%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderDstu3.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java
index 8c91751707b..759ec679134 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderDstu3.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.provider;
+package ca.uhn.fhir.mdm.provider;
 
 /*-
  * #%L
@@ -21,14 +21,14 @@ package ca.uhn.fhir.empi.provider;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkJson;
-import ca.uhn.fhir.empi.api.IEmpiControllerSvc;
-import ca.uhn.fhir.empi.api.IEmpiExpungeSvc;
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
-import ca.uhn.fhir.empi.api.MatchedTarget;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmLinkJson;
+import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
+import ca.uhn.fhir.mdm.api.IMdmExpungeSvc;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
+import ca.uhn.fhir.mdm.api.MatchedTarget;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.rest.annotation.IdParam;
 import ca.uhn.fhir.rest.annotation.Operation;
 import ca.uhn.fhir.rest.annotation.OperationParam;
@@ -58,11 +58,11 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Stream;
 
-public class EmpiProviderDstu3 extends BaseEmpiProvider {
-	private final IEmpiControllerSvc myEmpiControllerSvc;
-	private final IEmpiMatchFinderSvc myEmpiMatchFinderSvc;
-	private final IEmpiExpungeSvc myEmpiResetSvc;
-	private final IEmpiSubmitSvc myEmpiBatchSvc;
+public class MdmProviderDstu3 extends BaseMdmProvider {
+	private final IMdmControllerSvc myMdmControllerSvc;
+	private final IMdmMatchFinderSvc myMdmMatchFinderSvc;
+	private final IMdmExpungeSvc myMdmExpungeSvc;
+	private final IMdmSubmitSvc myMdmSubmitSvc;
 
 	/**
 	 * Constructor
@@ -70,12 +70,12 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 	 * Note that this is not a spring bean. Any necessary injections should
 	 * happen in the constructor
 	 */
-	public EmpiProviderDstu3(FhirContext theFhirContext, IEmpiControllerSvc theEmpiControllerSvc, IEmpiMatchFinderSvc theEmpiMatchFinderSvc, IEmpiExpungeSvc theEmpiResetSvc, IEmpiSubmitSvc theEmpiBatchSvc) {
+	public MdmProviderDstu3(FhirContext theFhirContext, IMdmControllerSvc theMdmControllerSvc, IMdmMatchFinderSvc theMdmMatchFinderSvc, IMdmExpungeSvc theMdmExpungeSvc, IMdmSubmitSvc theMdmSubmitSvc) {
 		super(theFhirContext);
-		myEmpiControllerSvc = theEmpiControllerSvc;
-		myEmpiMatchFinderSvc = theEmpiMatchFinderSvc;
-		myEmpiResetSvc = theEmpiResetSvc;
-		myEmpiBatchSvc = theEmpiBatchSvc;
+		myMdmControllerSvc = theMdmControllerSvc;
+		myMdmMatchFinderSvc = theMdmMatchFinderSvc;
+		myMdmExpungeSvc = theMdmExpungeSvc;
+		myMdmSubmitSvc = theMdmSubmitSvc;
 	}
 
 	@Operation(name = ProviderConstants.EMPI_MATCH, type = Patient.class)
@@ -105,7 +105,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 
 		MatchGrade matchGrade = getMatchGrade(theMatchedTarget);
 
-		searchComponent.addExtension(EmpiConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE, new CodeType(matchGrade.toCode()));
+		searchComponent.addExtension(MdmConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE, new CodeType(matchGrade.toCode()));
 		return searchComponent;
 	}
 
@@ -117,7 +117,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 
 		String resourceType = getResourceType(ProviderConstants.MDM_MERGE_GR_FROM_GOLDEN_RESOURCE_ID, theFromGoldenResourceId);
 
-		return myEmpiControllerSvc.mergeGoldenResources(theFromGoldenResourceId.getValue(), theToGoldenResourceId.getValue(),
+		return myMdmControllerSvc.mergeGoldenResources(theFromGoldenResourceId.getValue(), theToGoldenResourceId.getValue(),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.MERGE_PERSONS, resourceType));
 	}
 
@@ -129,7 +129,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 
 		validateUpdateLinkParameters(theGoldenResourceId, theTargetId, theMatchResult);
 
-		return myEmpiControllerSvc.updateLink(theGoldenResourceId.getValue(), theTargetId.getValue(), theMatchResult.getValue(),
+		return myMdmControllerSvc.updateLink(theGoldenResourceId.getValue(), theTargetId.getValue(), theMatchResult.getValue(),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.UPDATE_LINK,
 				getResourceType(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, theGoldenResourceId)));
 	}
@@ -141,16 +141,16 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 										  @OperationParam(name=ProviderConstants.EMPI_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theLinkSource,
 										  ServletRequestDetails theRequestDetails) {
 
-		Stream<EmpiLinkJson> empiLinkJson = myEmpiControllerSvc.queryLinks(extractStringOrNull(theGoldenResourceId), extractStringOrNull(theTargetResourceId),
+		Stream<MdmLinkJson> empiLinkJson = myMdmControllerSvc.queryLinks(extractStringOrNull(theGoldenResourceId), extractStringOrNull(theTargetResourceId),
 			extractStringOrNull(theMatchResult), extractStringOrNull(theLinkSource), createMdmContext(theRequestDetails,
 				MdmTransactionContext.OperationType.QUERY_LINKS, getResourceType(ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, theGoldenResourceId)));
-		return (Parameters) parametersFromEmpiLinks(empiLinkJson, true);
+		return (Parameters) parametersFromMdmLinks(empiLinkJson, true);
 	}
 
 	@Operation(name = ProviderConstants.MDM_DUPLICATE_GOLDEN_RESOURCES)
 	public Parameters getDuplicateGoldenResources(ServletRequestDetails theRequestDetails) {
-		Stream<EmpiLinkJson> possibleDuplicates = myEmpiControllerSvc.getDuplicateGoldenResources(createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.QUERY_LINKS, (String) null));
-		return (Parameters) parametersFromEmpiLinks(possibleDuplicates, false);
+		Stream<MdmLinkJson> possibleDuplicates = myMdmControllerSvc.getDuplicateGoldenResources(createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.QUERY_LINKS, (String) null));
+		return (Parameters) parametersFromMdmLinks(possibleDuplicates, false);
 	}
 
 	@Operation(name = ProviderConstants.MDM_NOT_DUPLICATE)
@@ -160,7 +160,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 																		  ServletRequestDetails theRequestDetails) {
 
 		validateNotDuplicateParameters(theGoldenResourceId, theTargetResourceId);
-		myEmpiControllerSvc.notDuplicateGoldenResource(theGoldenResourceId.getValue(), theTargetResourceId.getValue(),
+		myMdmControllerSvc.notDuplicateGoldenResource(theGoldenResourceId.getValue(), theTargetResourceId.getValue(),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.NOT_DUPLICATE, theGoldenResourceId.fhirType()));
 
 		Parameters retval = (Parameters) ParametersUtil.newInstance(myFhirContext);
@@ -175,7 +175,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 		@OperationParam(name= ProviderConstants.MDM_BATCH_RUN_CRITERIA,min = 0 , max = 1) StringType theCriteria,
 		ServletRequestDetails theRequestDetails) {
 		String criteria = convertCriteriaToString(theCriteria);
-		long submittedCount  = myEmpiBatchSvc.submitAllTargetTypesToEmpi(criteria);
+		long submittedCount  = myMdmSubmitSvc.submitAllTargetTypesToMdm(criteria);
 		return buildEmpiOutParametersWithCount(submittedCount);
 	}
 
@@ -190,9 +190,9 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 												ServletRequestDetails theRequestDetails) {
 		long resetCount;
 		if (theTargetType == null || StringUtils.isBlank(theTargetType.getValue())) {
-			resetCount = myEmpiResetSvc.expungeAllEmpiLinks(theRequestDetails);
+			resetCount = myMdmExpungeSvc.expungeAllMdmLinks(theRequestDetails);
 		} else {
-			resetCount = myEmpiResetSvc.expungeAllMdmLinksOfTargetType(theTargetType.getValueNotNull(), theRequestDetails);
+			resetCount = myMdmExpungeSvc.expungeAllMdmLinksOfTargetType(theTargetType.getValueNotNull(), theRequestDetails);
 		}
 		Parameters parameters = new Parameters();
 		parameters.addParameter().setName(ProviderConstants.OPERATION_MDM_CLEAR_OUT_PARAM_DELETED_COUNT)
@@ -206,7 +206,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 	public Parameters empiBatchPatientInstance(
 		@IdParam IIdType theIdParam,
 		RequestDetails theRequest) {
-		long submittedCount = myEmpiBatchSvc.submitTargetToMdm(theIdParam);
+		long submittedCount = myMdmSubmitSvc.submitTargetToMdm(theIdParam);
 		return buildEmpiOutParametersWithCount(submittedCount);
 	}
 
@@ -217,7 +217,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 		@OperationParam(name = ProviderConstants.MDM_BATCH_RUN_CRITERIA) StringType theCriteria,
 		RequestDetails theRequest) {
 		String criteria = convertCriteriaToString(theCriteria);
-		long submittedCount = myEmpiBatchSvc.submitPatientTypeToMdm(criteria);
+		long submittedCount = myMdmSubmitSvc.submitPatientTypeToMdm(criteria);
 		return buildEmpiOutParametersWithCount(submittedCount);
 	}
 
@@ -227,7 +227,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 	public Parameters empiBatchPractitionerInstance(
 		@IdParam IIdType theIdParam,
 		RequestDetails theRequest) {
-		long submittedCount = myEmpiBatchSvc.submitTargetToMdm(theIdParam);
+		long submittedCount = myMdmSubmitSvc.submitTargetToMdm(theIdParam);
 		return buildEmpiOutParametersWithCount(submittedCount);
 	}
 
@@ -238,7 +238,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 		@OperationParam(name = ProviderConstants.MDM_BATCH_RUN_CRITERIA) StringType theCriteria,
 		RequestDetails theRequest) {
 		String criteria = convertCriteriaToString(theCriteria);
-		long submittedCount = myEmpiBatchSvc.submitPractitionerTypeToMdm(criteria);
+		long submittedCount = myMdmSubmitSvc.submitPractitionerTypeToMdm(criteria);
 		return buildEmpiOutParametersWithCount(submittedCount);
 	}
 
@@ -254,7 +254,7 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 	}
 
 	private Bundle getMatchesAndPossibleMatchesForResource(IAnyResource theResource, String theResourceType) {
-		List<MatchedTarget> matches = myEmpiMatchFinderSvc.getMatchedTargets(theResourceType, theResource);
+		List<MatchedTarget> matches = myMdmMatchFinderSvc.getMatchedTargets(theResourceType, theResource);
 		matches.sort(Comparator.comparing((MatchedTarget m) -> m.getMatchResult().getNormalizedScore()).reversed());
 
 		Bundle retVal = new Bundle();
@@ -290,10 +290,10 @@ public class EmpiProviderDstu3 extends BaseEmpiProvider {
 
 	protected String getResourceType(String theParamName, StringType theResourceId) {
 		if (theResourceId != null) {
-			IIdType idType = EmpiControllerUtil.getGoldenIdDtOrThrowException(theParamName, theResourceId.getValueNotNull());
+			IIdType idType = MdmControllerUtil.getGoldenIdDtOrThrowException(theParamName, theResourceId.getValueNotNull());
 			return idType.getResourceType();
 		} else {
-			return EmpiConstants.UNKNOWN_MDM_TYPES;
+			return MdmConstants.UNKNOWN_MDM_TYPES;
 		}
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderLoader.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java
similarity index 59%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderLoader.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java
index 04908eb6247..c8bb34e1855 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderLoader.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.provider;
+package ca.uhn.fhir.mdm.provider;
 
 /*-
  * #%L
@@ -22,39 +22,39 @@ package ca.uhn.fhir.empi.provider;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.IEmpiControllerSvc;
-import ca.uhn.fhir.empi.api.IEmpiExpungeSvc;
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
+import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
+import ca.uhn.fhir.mdm.api.IMdmExpungeSvc;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
 import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmpiProviderLoader {
+public class MdmProviderLoader {
 	@Autowired
 	private FhirContext myFhirContext;
 	@Autowired
 	private ResourceProviderFactory myResourceProviderFactory;
 	@Autowired
-	private IEmpiMatchFinderSvc myEmpiMatchFinderSvc;
+	private IMdmMatchFinderSvc myMdmMatchFinderSvc;
 	@Autowired
-	private IEmpiControllerSvc myEmpiControllerSvc;
+	private IMdmControllerSvc myMdmControllerSvc;
 	@Autowired
-	private IEmpiExpungeSvc myEmpiResetSvc;
+	private IMdmExpungeSvc myMdmExpungeSvc;
 	@Autowired
-	private IEmpiSubmitSvc myEmpiBatchSvc;
+	private IMdmSubmitSvc myMdmSubmitSvc;
 
 	public void loadProvider() {
 		switch (myFhirContext.getVersion().getVersion()) {
 			case DSTU3:
-				myResourceProviderFactory.addSupplier(() -> new EmpiProviderDstu3(myFhirContext, myEmpiControllerSvc, myEmpiMatchFinderSvc, myEmpiResetSvc, myEmpiBatchSvc));
+				myResourceProviderFactory.addSupplier(() -> new MdmProviderDstu3(myFhirContext, myMdmControllerSvc, myMdmMatchFinderSvc, myMdmExpungeSvc, myMdmSubmitSvc));
 				break;
 			case R4:
-				myResourceProviderFactory.addSupplier(() -> new EmpiProviderR4(myFhirContext, myEmpiControllerSvc, myEmpiMatchFinderSvc, myEmpiResetSvc, myEmpiBatchSvc));
+				myResourceProviderFactory.addSupplier(() -> new MdmProviderR4(myFhirContext, myMdmControllerSvc, myMdmMatchFinderSvc, myMdmExpungeSvc, myMdmSubmitSvc));
 				break;
 			default:
-				throw new ConfigurationException("EMPI not supported for FHIR version " + myFhirContext.getVersion().getVersion());
+				throw new ConfigurationException("MDM not supported for FHIR version " + myFhirContext.getVersion().getVersion());
 		}
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderR4.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java
similarity index 84%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderR4.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java
index ab25e0435b5..8879244cdc0 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderR4.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.provider;
+package ca.uhn.fhir.mdm.provider;
 
 /*-
  * #%L
@@ -21,14 +21,14 @@ package ca.uhn.fhir.empi.provider;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiLinkJson;
-import ca.uhn.fhir.empi.api.IEmpiControllerSvc;
-import ca.uhn.fhir.empi.api.IEmpiExpungeSvc;
-import ca.uhn.fhir.empi.api.IEmpiMatchFinderSvc;
-import ca.uhn.fhir.empi.api.IEmpiSubmitSvc;
-import ca.uhn.fhir.empi.api.MatchedTarget;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmLinkJson;
+import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
+import ca.uhn.fhir.mdm.api.IMdmExpungeSvc;
+import ca.uhn.fhir.mdm.api.IMdmMatchFinderSvc;
+import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
+import ca.uhn.fhir.mdm.api.MatchedTarget;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.rest.annotation.IdParam;
 import ca.uhn.fhir.rest.annotation.Operation;
 import ca.uhn.fhir.rest.annotation.OperationParam;
@@ -59,11 +59,11 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Stream;
 
-public class EmpiProviderR4 extends BaseEmpiProvider {
-	private final IEmpiControllerSvc myEmpiControllerSvc;
-	private final IEmpiMatchFinderSvc myEmpiMatchFinderSvc;
-	private final IEmpiExpungeSvc myMdmExpungeSvc;
-	private final IEmpiSubmitSvc myMdmSubmitSvc;
+public class MdmProviderR4 extends BaseMdmProvider {
+	private final IMdmControllerSvc myMdmControllerSvc;
+	private final IMdmMatchFinderSvc myMdmMatchFinderSvc;
+	private final IMdmExpungeSvc myMdmExpungeSvc;
+	private final IMdmSubmitSvc myMdmSubmitSvc;
 
 	/**
 	 * Constructor
@@ -71,10 +71,10 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 	 * Note that this is not a spring bean. Any necessary injections should
 	 * happen in the constructor
 	 */
-	public EmpiProviderR4(FhirContext theFhirContext, IEmpiControllerSvc theEmpiControllerSvc, IEmpiMatchFinderSvc theEmpiMatchFinderSvc, IEmpiExpungeSvc theMdmExpungeSvc, IEmpiSubmitSvc theMdmSubmitSvc) {
+	public MdmProviderR4(FhirContext theFhirContext, IMdmControllerSvc theMdmControllerSvc, IMdmMatchFinderSvc theMdmMatchFinderSvc, IMdmExpungeSvc theMdmExpungeSvc, IMdmSubmitSvc theMdmSubmitSvc) {
 		super(theFhirContext);
-		myEmpiControllerSvc = theEmpiControllerSvc;
-		myEmpiMatchFinderSvc = theEmpiMatchFinderSvc;
+		myMdmControllerSvc = theMdmControllerSvc;
+		myMdmMatchFinderSvc = theMdmMatchFinderSvc;
 		myMdmExpungeSvc = theMdmExpungeSvc;
 		myMdmSubmitSvc = theMdmSubmitSvc;
 	}
@@ -108,7 +108,7 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 	 * @return
 	 */
 	private Bundle getMatchesAndPossibleMatchesForResource(IAnyResource theResource, String theTheValueNotNull) {
-		List<MatchedTarget> matches = myEmpiMatchFinderSvc.getMatchedTargets(theTheValueNotNull, theResource);
+		List<MatchedTarget> matches = myMdmMatchFinderSvc.getMatchedTargets(theTheValueNotNull, theResource);
 
 		matches.sort(Comparator.comparing((MatchedTarget m) -> m.getMatchResult().getNormalizedScore()).reversed());
 
@@ -140,7 +140,7 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 
 		MatchGrade matchGrade = getMatchGrade(theMatchedTarget);
 
-		searchComponent.addExtension(EmpiConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE, new CodeType(matchGrade.toCode()));
+		searchComponent.addExtension(MdmConstants.FIHR_STRUCTURE_DEF_MATCH_GRADE_URL_NAMESPACE, new CodeType(matchGrade.toCode()));
 		return searchComponent;
 	}
 
@@ -150,7 +150,7 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 															RequestDetails theRequestDetails) {
 		validateMergeParameters(theFromGoldenResourceId, theToGoldenResourceId);
 
-		return myEmpiControllerSvc.mergeGoldenResources(theFromGoldenResourceId.getValue(), theToGoldenResourceId.getValue(),
+		return myMdmControllerSvc.mergeGoldenResources(theFromGoldenResourceId.getValue(), theToGoldenResourceId.getValue(),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.MERGE_PERSONS,
 				getResourceType(ProviderConstants.MDM_MERGE_GR_FROM_GOLDEN_RESOURCE_ID, theFromGoldenResourceId))
 		);
@@ -162,7 +162,7 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 								  @OperationParam(name=ProviderConstants.MDM_UPDATE_LINK_MATCH_RESULT, min = 1, max = 1) StringType theMatchResult,
 								  ServletRequestDetails theRequestDetails) {
 		validateUpdateLinkParameters(theGoldenResourceId, theResourceId, theMatchResult);
-		return myEmpiControllerSvc.updateLink(theGoldenResourceId.getValueNotNull(), theResourceId.getValue(),
+		return myMdmControllerSvc.updateLink(theGoldenResourceId.getValueNotNull(), theResourceId.getValue(),
 			theMatchResult.getValue(),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.UPDATE_LINK,
 				getResourceType(ProviderConstants.MDM_UPDATE_LINK_GOLDEN_RESOURCE_ID, theGoldenResourceId))
@@ -172,11 +172,11 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 	@Operation(name = ProviderConstants.MDM_CLEAR, returnParameters = {
 		@OperationParam(name = ProviderConstants.OPERATION_MDM_BATCH_RUN_OUT_PARAM_SUBMIT_COUNT, type=DecimalType.class)
 	})
-	public Parameters clearEmpiLinks(@OperationParam(name=ProviderConstants.MDM_CLEAR_TARGET_TYPE, min = 0, max = 1) StringType theTargetType,
-												ServletRequestDetails theRequestDetails) {
+	public Parameters clearMdmLinks(@OperationParam(name=ProviderConstants.MDM_CLEAR_TARGET_TYPE, min = 0, max = 1) StringType theTargetType,
+											  ServletRequestDetails theRequestDetails) {
 		long resetCount;
 		if (theTargetType == null || StringUtils.isBlank(theTargetType.getValue())) {
-			resetCount = myMdmExpungeSvc.expungeAllEmpiLinks(theRequestDetails);
+			resetCount = myMdmExpungeSvc.expungeAllMdmLinks(theRequestDetails);
 		} else {
 			resetCount = myMdmExpungeSvc.expungeAllMdmLinksOfTargetType(theTargetType.getValueNotNull(), theRequestDetails);
 		}
@@ -194,20 +194,20 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 									 @OperationParam(name=ProviderConstants.EMPI_QUERY_LINKS_LINK_SOURCE, min = 0, max = 1) StringType theLinkSource,
 									 ServletRequestDetails theRequestDetails) {
 
-		Stream<EmpiLinkJson> empiLinkJson = myEmpiControllerSvc.queryLinks(extractStringOrNull(theGoldenResourceId),
+		Stream<MdmLinkJson> empiLinkJson = myMdmControllerSvc.queryLinks(extractStringOrNull(theGoldenResourceId),
 			extractStringOrNull(theResourceId), extractStringOrNull(theMatchResult), extractStringOrNull(theLinkSource),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.QUERY_LINKS,
 				getResourceType(ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, theGoldenResourceId))
 		);
-		return (Parameters) parametersFromEmpiLinks(empiLinkJson, true);
+		return (Parameters) parametersFromMdmLinks(empiLinkJson, true);
 	}
 
 	@Operation(name = ProviderConstants.MDM_DUPLICATE_GOLDEN_RESOURCES, idempotent = true)
 	public Parameters getDuplicateGoldenResources(ServletRequestDetails theRequestDetails) {
-		Stream<EmpiLinkJson> possibleDuplicates = myEmpiControllerSvc.getDuplicateGoldenResources(
+		Stream<MdmLinkJson> possibleDuplicates = myMdmControllerSvc.getDuplicateGoldenResources(
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.DUPLICATE_GOLDEN_RESOURCES, (String) null)
 		);
-		return (Parameters) parametersFromEmpiLinks(possibleDuplicates, false);
+		return (Parameters) parametersFromMdmLinks(possibleDuplicates, false);
 	}
 
 	@Operation(name = ProviderConstants.MDM_NOT_DUPLICATE)
@@ -216,7 +216,7 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 											 ServletRequestDetails theRequestDetails) {
 
 		validateNotDuplicateParameters(theGoldenResourceId, theResourceId);
-		myEmpiControllerSvc.notDuplicateGoldenResource(theGoldenResourceId.getValue(), theResourceId.getValue(),
+		myMdmControllerSvc.notDuplicateGoldenResource(theGoldenResourceId.getValue(), theResourceId.getValue(),
 			createMdmContext(theRequestDetails, MdmTransactionContext.OperationType.NOT_DUPLICATE,
 				getResourceType(ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, theGoldenResourceId))
 		);
@@ -239,9 +239,9 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 
 		long submittedCount;
 		if (resourceType != null) {
-			submittedCount  = myMdmSubmitSvc.submitTargetTypeToEmpi(resourceType, criteria);
+			submittedCount  = myMdmSubmitSvc.submitTargetTypeToMdm(resourceType, criteria);
 		} else {
-			submittedCount  = myMdmSubmitSvc.submitAllTargetTypesToEmpi(criteria);
+			submittedCount  = myMdmSubmitSvc.submitAllTargetTypesToMdm(criteria);
 
 		}
 		return buildMdmOutParametersWithCount(submittedCount);
@@ -318,10 +318,10 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
 
 	private String getResourceType(String theParamName, StringType theResourceId) {
 		if (theResourceId != null) {
-			IIdType idType = EmpiControllerUtil.getGoldenIdDtOrThrowException(theParamName, theResourceId.getValueNotNull());
+			IIdType idType = MdmControllerUtil.getGoldenIdDtOrThrowException(theParamName, theResourceId.getValueNotNull());
 			return idType.getResourceType();
 		} else {
-			return EmpiConstants.UNKNOWN_MDM_TYPES;
+			return MdmConstants.UNKNOWN_MDM_TYPES;
 		}
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/config/EmpiRuleValidator.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java
similarity index 70%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/config/EmpiRuleValidator.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java
index 658d420be77..73764eaf395 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/config/EmpiRuleValidator.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.config;
+package ca.uhn.fhir.mdm.rules.config;
 
 /*-
  * #%L
@@ -23,13 +23,13 @@ package ca.uhn.fhir.empi.rules.config;
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.IEmpiRuleValidator;
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiFilterSearchParamJson;
-import ca.uhn.fhir.empi.rules.json.EmpiResourceSearchParamJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.rules.json.EmpiSimilarityJson;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.IMdmRuleValidator;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmFilterSearchParamJson;
+import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.mdm.rules.json.MdmSimilarityJson;
 import ca.uhn.fhir.parser.DataFormatException;
 import ca.uhn.fhir.rest.server.util.ISearchParamRetriever;
 import ca.uhn.fhir.util.FhirTerser;
@@ -46,8 +46,8 @@ import java.util.List;
 import java.util.Set;
 
 @Service
-public class EmpiRuleValidator implements IEmpiRuleValidator {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiRuleValidator.class);
+public class MdmRuleValidator implements IMdmRuleValidator {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmRuleValidator.class);
 
 	private final FhirContext myFhirContext;
 	private final ISearchParamRetriever mySearchParamRetriever;
@@ -56,7 +56,7 @@ public class EmpiRuleValidator implements IEmpiRuleValidator {
 	private final FhirTerser myTerser;
 
 	@Autowired
-	public EmpiRuleValidator(FhirContext theFhirContext, ISearchParamRetriever theSearchParamRetriever) {
+	public MdmRuleValidator(FhirContext theFhirContext, ISearchParamRetriever theSearchParamRetriever) {
 		myFhirContext = theFhirContext;
 		myPatientClass = theFhirContext.getResourceDefinition("Patient").getImplementingClass();
 		myPractitionerClass = theFhirContext.getResourceDefinition("Practitioner").getImplementingClass();
@@ -64,18 +64,18 @@ public class EmpiRuleValidator implements IEmpiRuleValidator {
 		mySearchParamRetriever = theSearchParamRetriever;
 	}
 
-	public void validate(EmpiRulesJson theEmpiRulesJson) {
-		validateMdmTypes(theEmpiRulesJson);
-		validateSearchParams(theEmpiRulesJson);
-		validateMatchFields(theEmpiRulesJson);
-		validateSystemIsUri(theEmpiRulesJson);
+	public void validate(MdmRulesJson theMdmRules) {
+		validateMdmTypes(theMdmRules);
+		validateSearchParams(theMdmRules);
+		validateMatchFields(theMdmRules);
+		validateSystemIsUri(theMdmRules);
 	}
 
-	public void validateMdmTypes(EmpiRulesJson theEmpiRulesJson) {
-		if (theEmpiRulesJson.getMdmTypes() == null) {
+	public void validateMdmTypes(MdmRulesJson theMdmRulesJson) {
+		if (theMdmRulesJson.getMdmTypes() == null) {
 			throw new ConfigurationException("mdmTypes must be set to a list of resource types.");
 		}
-		for (String resourceType: theEmpiRulesJson.getMdmTypes()) {
+		for (String resourceType: theMdmRulesJson.getMdmTypes()) {
 			validateTypeHasIdentifier(resourceType);
 		}
 	}
@@ -86,18 +86,18 @@ public class EmpiRuleValidator implements IEmpiRuleValidator {
 		}
 	}
 
-	private void validateSearchParams(EmpiRulesJson theEmpiRulesJson) {
-		for (EmpiResourceSearchParamJson searchParams : theEmpiRulesJson.getCandidateSearchParams()) {
+	private void validateSearchParams(MdmRulesJson theMdmRulesJson) {
+		for (MdmResourceSearchParamJson searchParams : theMdmRulesJson.getCandidateSearchParams()) {
 			searchParams.iterator().forEachRemaining(
 				searchParam -> validateSearchParam("candidateSearchParams", searchParams.getResourceType(), searchParam));
 		}
-		for (EmpiFilterSearchParamJson filter : theEmpiRulesJson.getCandidateFilterSearchParams()) {
+		for (MdmFilterSearchParamJson filter : theMdmRulesJson.getCandidateFilterSearchParams()) {
 			validateSearchParam("candidateFilterSearchParams", filter.getResourceType(), filter.getSearchParam());
 		}
 	}
 
 	private void validateSearchParam(String theFieldName, String theTheResourceType, String theTheSearchParam) {
-		if (EmpiConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE.equals(theTheResourceType)) {
+		if (MdmConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE.equals(theTheResourceType)) {
 			validateResourceSearchParam(theFieldName, "Patient", theTheSearchParam);
 			validateResourceSearchParam(theFieldName, "Practitioner", theTheSearchParam);
 		} else {
@@ -111,9 +111,9 @@ public class EmpiRuleValidator implements IEmpiRuleValidator {
 		}
 	}
 
-	private void validateMatchFields(EmpiRulesJson theEmpiRulesJson) {
+	private void validateMatchFields(MdmRulesJson theMdmRulesJson) {
 		Set<String> names = new HashSet<>();
-		for (EmpiFieldMatchJson fieldMatch : theEmpiRulesJson.getMatchFields()) {
+		for (MdmFieldMatchJson fieldMatch : theMdmRulesJson.getMatchFields()) {
 			if (names.contains(fieldMatch.getName())) {
 				throw new ConfigurationException("Two MatchFields have the same name '" + fieldMatch.getName() + "'");
 			}
@@ -123,36 +123,36 @@ public class EmpiRuleValidator implements IEmpiRuleValidator {
 			} else if (fieldMatch.getMatcher() == null) {
 				throw new ConfigurationException("MatchField " + fieldMatch.getName() + " has neither a similarity nor a matcher.  At least one must be present.");
 			}
-			validatePath(theEmpiRulesJson.getMdmTypes(), fieldMatch);
+			validatePath(theMdmRulesJson.getMdmTypes(), fieldMatch);
 		}
 	}
 
-	private void validateSimilarity(EmpiFieldMatchJson theFieldMatch) {
-		EmpiSimilarityJson similarity = theFieldMatch.getSimilarity();
+	private void validateSimilarity(MdmFieldMatchJson theFieldMatch) {
+		MdmSimilarityJson similarity = theFieldMatch.getSimilarity();
 		if (similarity.getMatchThreshold() == null) {
 			throw new ConfigurationException("MatchField " + theFieldMatch.getName() + " similarity " + similarity.getAlgorithm() + " requires a matchThreshold");
 		}
 	}
 
-	private void validatePath(List<String> theMdmTypes, EmpiFieldMatchJson theFieldMatch) {
+	private void validatePath(List<String> theMdmTypes, MdmFieldMatchJson theFieldMatch) {
 		String resourceType = theFieldMatch.getResourceType();
 
 
-		if (EmpiConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE.equals(resourceType)) {
+		if (MdmConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE.equals(resourceType)) {
 			validateFieldPathForAllTypes(theMdmTypes, theFieldMatch);
 		} else {
 			validateFieldPath(theFieldMatch);
 		}
 	}
 
-	private void validateFieldPathForAllTypes(List<String> theMdmResourceTypes, EmpiFieldMatchJson theFieldMatch) {
+	private void validateFieldPathForAllTypes(List<String> theMdmResourceTypes, MdmFieldMatchJson theFieldMatch) {
 
 		for (String resourceType: theMdmResourceTypes) {
 			validateFieldPathForType(resourceType, theFieldMatch);
 		}
 	}
 
-	private void validateFieldPathForType(String theResourceType, EmpiFieldMatchJson theFieldMatch) {
+	private void validateFieldPathForType(String theResourceType, MdmFieldMatchJson theFieldMatch) {
 		try {
 			RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(theResourceType);
 			Class<? extends IBaseResource> implementingClass = resourceDefinition.getImplementingClass();
@@ -168,17 +168,17 @@ public class EmpiRuleValidator implements IEmpiRuleValidator {
 		}
 	}
 
-	private void validateFieldPath(EmpiFieldMatchJson theFieldMatch) {
+	private void validateFieldPath(MdmFieldMatchJson theFieldMatch) {
 		validateFieldPathForType(theFieldMatch.getResourceType(), theFieldMatch);
 	}
 
-	private void validateSystemIsUri(EmpiRulesJson theEmpiRulesJson) {
-		if (theEmpiRulesJson.getEnterpriseEIDSystem() == null) {
+	private void validateSystemIsUri(MdmRulesJson theMdmRulesJson) {
+		if (theMdmRulesJson.getEnterpriseEIDSystem() == null) {
 			return;
 		}
 
 		try {
-			new URI(theEmpiRulesJson.getEnterpriseEIDSystem());
+			new URI(theMdmRulesJson.getEnterpriseEIDSystem());
 		} catch (URISyntaxException e) {
 			throw new ConfigurationException("Enterprise Identifier System (eidSystem) must be a valid URI");
 		}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/config/EmpiSettings.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java
similarity index 63%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/config/EmpiSettings.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java
index db310c8933d..a1d6ab97f1f 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/config/EmpiSettings.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.config;
+package ca.uhn.fhir.mdm.rules.config;
 
 /*-
  * #%L
@@ -20,9 +20,9 @@ package ca.uhn.fhir.empi.rules.config;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.IEmpiRuleValidator;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
+import ca.uhn.fhir.mdm.api.IMdmRuleValidator;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 import ca.uhn.fhir.util.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,13 +30,13 @@ import org.springframework.stereotype.Component;
 import java.io.IOException;
 
 @Component
-public class EmpiSettings implements IEmpiSettings {
-	private final IEmpiRuleValidator myEmpiRuleValidator;
+public class MdmSettings implements IMdmSettings {
+	private final IMdmRuleValidator myMdmRuleValidator;
 
 	private boolean myEnabled;
-	private int myConcurrentConsumers = EMPI_DEFAULT_CONCURRENT_CONSUMERS;
+	private int myConcurrentConsumers = MDM_DEFAULT_CONCURRENT_CONSUMERS;
 	private String myScriptText;
-	private EmpiRulesJson myEmpiRules;
+	private MdmRulesJson myMdmRules;
 	private boolean myPreventEidUpdates;
 
 	/**
@@ -49,8 +49,8 @@ public class EmpiSettings implements IEmpiSettings {
 	private boolean myPreventMultipleEids;
 
 	@Autowired
-	public EmpiSettings(IEmpiRuleValidator theEmpiRuleValidator) {
-		myEmpiRuleValidator = theEmpiRuleValidator;
+	public MdmSettings(IMdmRuleValidator theMdmRuleValidator) {
+		myMdmRuleValidator = theMdmRuleValidator;
 	}
 
 	@Override
@@ -58,7 +58,7 @@ public class EmpiSettings implements IEmpiSettings {
 		return myEnabled;
 	}
 
-	public EmpiSettings setEnabled(boolean theEnabled) {
+	public MdmSettings setEnabled(boolean theEnabled) {
 		myEnabled = theEnabled;
 		return this;
 	}
@@ -68,7 +68,7 @@ public class EmpiSettings implements IEmpiSettings {
 		return myConcurrentConsumers;
 	}
 
-	public EmpiSettings setConcurrentConsumers(int theConcurrentConsumers) {
+	public MdmSettings setConcurrentConsumers(int theConcurrentConsumers) {
 		myConcurrentConsumers = theConcurrentConsumers;
 		return this;
 	}
@@ -77,15 +77,15 @@ public class EmpiSettings implements IEmpiSettings {
 		return myScriptText;
 	}
 
-	public EmpiSettings setScriptText(String theScriptText) throws IOException {
+	public MdmSettings setScriptText(String theScriptText) throws IOException {
 		myScriptText = theScriptText;
-		setEmpiRules(JsonUtil.deserialize(theScriptText, EmpiRulesJson.class));
+		setMdmRules(JsonUtil.deserialize(theScriptText, MdmRulesJson.class));
 		return this;
 	}
 
 	@Override
-	public EmpiRulesJson getEmpiRules() {
-		return myEmpiRules;
+	public MdmRulesJson getMdmRules() {
+		return myMdmRules;
 	}
 
 	@Override
@@ -93,14 +93,14 @@ public class EmpiSettings implements IEmpiSettings {
 		return myPreventEidUpdates;
 	}
 
-	public EmpiSettings setPreventEidUpdates(boolean thePreventEidUpdates) {
+	public MdmSettings setPreventEidUpdates(boolean thePreventEidUpdates) {
 		myPreventEidUpdates = thePreventEidUpdates;
 		return this;
 	}
 
-	public EmpiSettings setEmpiRules(EmpiRulesJson theEmpiRules) {
-		myEmpiRuleValidator.validate(theEmpiRules);
-		myEmpiRules = theEmpiRules;
+	public MdmSettings setMdmRules(MdmRulesJson theMdmRules) {
+		myMdmRuleValidator.validate(theMdmRules);
+		myMdmRules = theMdmRules;
 		return this;
 	}
 
@@ -110,10 +110,10 @@ public class EmpiSettings implements IEmpiSettings {
 
 	@Override
 	public String getRuleVersion() {
-		return myEmpiRules.getVersion();
+		return myMdmRules.getVersion();
 	}
 
-	public EmpiSettings setPreventMultipleEids(boolean thePreventMultipleEids) {
+	public MdmSettings setPreventMultipleEids(boolean thePreventMultipleEids) {
 		myPreventMultipleEids = thePreventMultipleEids;
 		return this;
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiFieldMatchJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java
similarity index 71%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiFieldMatchJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java
index 27895def948..472b8d87899 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiFieldMatchJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -21,8 +21,8 @@ package ca.uhn.fhir.empi.rules.json;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiMatchEvaluation;
-import ca.uhn.fhir.empi.rules.matcher.EmpiMatcherEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchEvaluation;
+import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherEnum;
 import ca.uhn.fhir.model.api.IModelJson;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -33,11 +33,11 @@ import javax.annotation.Nonnull;
 /**
  * Contains all business data for determining if a match exists on a particular field, given:
  * <p></p>
- * 1. A {@link EmpiMatcherEnum} which determines the actual similarity values.
+ * 1. A {@link MdmMatcherEnum} which determines the actual similarity values.
  * 2. A given resource type (e.g. Patient)
  * 3. A given FHIRPath expression for finding the particular primitive to be used for comparison. (e.g. name.given)
  */
-public class EmpiFieldMatchJson implements IModelJson {
+public class MdmFieldMatchJson implements IModelJson {
 	@JsonProperty(value = "name", required = true)
 	String myName;
 
@@ -48,16 +48,16 @@ public class EmpiFieldMatchJson implements IModelJson {
 	String myResourcePath;
 
 	@JsonProperty(value = "matcher", required = false)
-	EmpiMatcherJson myMatcher;
+	MdmMatcherJson myMatcher;
 
 	@JsonProperty(value = "similarity", required = false)
-	EmpiSimilarityJson mySimilarity;
+	MdmSimilarityJson mySimilarity;
 
 	public String getResourceType() {
 		return myResourceType;
 	}
 
-	public EmpiFieldMatchJson setResourceType(String theResourceType) {
+	public MdmFieldMatchJson setResourceType(String theResourceType) {
 		myResourceType = theResourceType;
 		return this;
 	}
@@ -66,7 +66,7 @@ public class EmpiFieldMatchJson implements IModelJson {
 		return myResourcePath;
 	}
 
-	public EmpiFieldMatchJson setResourcePath(String theResourcePath) {
+	public MdmFieldMatchJson setResourcePath(String theResourcePath) {
 		myResourcePath = theResourcePath;
 		return this;
 	}
@@ -75,33 +75,33 @@ public class EmpiFieldMatchJson implements IModelJson {
 		return myName;
 	}
 
-	public EmpiFieldMatchJson setName(@Nonnull String theName) {
+	public MdmFieldMatchJson setName(@Nonnull String theName) {
 		myName = theName;
 		return this;
 	}
 
-	public EmpiMatcherJson getMatcher() {
+	public MdmMatcherJson getMatcher() {
 		return myMatcher;
 	}
 
-	public EmpiFieldMatchJson setMatcher(EmpiMatcherJson theMatcher) {
+	public MdmFieldMatchJson setMatcher(MdmMatcherJson theMatcher) {
 		myMatcher = theMatcher;
 		return this;
 	}
 
-	public EmpiSimilarityJson getSimilarity() {
+	public MdmSimilarityJson getSimilarity() {
 		return mySimilarity;
 	}
 
-	public EmpiFieldMatchJson setSimilarity(EmpiSimilarityJson theSimilarity) {
+	public MdmFieldMatchJson setSimilarity(MdmSimilarityJson theSimilarity) {
 		mySimilarity = theSimilarity;
 		return this;
 	}
 
-	public EmpiMatchEvaluation match(FhirContext theFhirContext, IBase theLeftValue, IBase theRightValue) {
+	public MdmMatchEvaluation match(FhirContext theFhirContext, IBase theLeftValue, IBase theRightValue) {
 		if (myMatcher != null) {
 			boolean result = myMatcher.match(theFhirContext, theLeftValue, theRightValue);
-			return new EmpiMatchEvaluation(result, result ? 1.0 : 0.0);
+			return new MdmMatchEvaluation(result, result ? 1.0 : 0.0);
 		}
 		if (mySimilarity != null) {
 			return mySimilarity.match(theFhirContext, theLeftValue, theRightValue);
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiFilterSearchParamJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java
similarity index 82%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiFilterSearchParamJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java
index 1db1ffd18b3..2719107f240 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiFilterSearchParamJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * This SearchParamJson, unlike EmpiREsourceSearchParamJson, is responsible for doing inclusions during empi
  * candidate searching. e.g. When doing candidate matching, only consider candidates that match all EmpiFilterSearchParams.
  */
-public class EmpiFilterSearchParamJson implements IModelJson {
+public class MdmFilterSearchParamJson implements IModelJson {
 	@JsonProperty(value = "resourceType", required = true)
 	String myResourceType;
 	@JsonProperty(value = "searchParam", required = true)
@@ -42,7 +42,7 @@ public class EmpiFilterSearchParamJson implements IModelJson {
 		return myResourceType;
 	}
 
-	public EmpiFilterSearchParamJson setResourceType(String theResourceType) {
+	public MdmFilterSearchParamJson setResourceType(String theResourceType) {
 		myResourceType = theResourceType;
 		return this;
 	}
@@ -51,7 +51,7 @@ public class EmpiFilterSearchParamJson implements IModelJson {
 		return mySearchParam;
 	}
 
-	public EmpiFilterSearchParamJson setSearchParam(String theSearchParam) {
+	public MdmFilterSearchParamJson setSearchParam(String theSearchParam) {
 		mySearchParam = theSearchParam;
 		return this;
 	}
@@ -61,7 +61,7 @@ public class EmpiFilterSearchParamJson implements IModelJson {
 		return myTokenParamModifier;
 	}
 
-	public EmpiFilterSearchParamJson setTokenParamModifier(TokenParamModifier theTokenParamModifier) {
+	public MdmFilterSearchParamJson setTokenParamModifier(TokenParamModifier theTokenParamModifier) {
 		myTokenParamModifier = theTokenParamModifier;
 		return this;
 	}
@@ -70,7 +70,7 @@ public class EmpiFilterSearchParamJson implements IModelJson {
 		return myFixedValue;
 	}
 
-	public EmpiFilterSearchParamJson setFixedValue(String theFixedValue) {
+	public MdmFilterSearchParamJson setFixedValue(String theFixedValue) {
 		myFixedValue = theFixedValue;
 		return this;
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiMatcherJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java
similarity index 80%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiMatcherJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java
index 33f5981c850..cefe78d76b9 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiMatcherJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -21,14 +21,14 @@ package ca.uhn.fhir.empi.rules.json;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.rules.matcher.EmpiMatcherEnum;
+import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherEnum;
 import ca.uhn.fhir.model.api.IModelJson;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hl7.fhir.instance.model.api.IBase;
 
-public class EmpiMatcherJson  implements IModelJson {
+public class MdmMatcherJson implements IModelJson {
 	@JsonProperty(value = "algorithm", required = true)
-	EmpiMatcherEnum myAlgorithm;
+	MdmMatcherEnum myAlgorithm;
 
 	@JsonProperty(value = "identifierSystem", required = false)
 	String myIdentifierSystem;
@@ -39,11 +39,11 @@ public class EmpiMatcherJson  implements IModelJson {
 	@JsonProperty(value = "exact")
 	boolean myExact;
 
-	public EmpiMatcherEnum getAlgorithm() {
+	public MdmMatcherEnum getAlgorithm() {
 		return myAlgorithm;
 	}
 
-	public EmpiMatcherJson setAlgorithm(EmpiMatcherEnum theAlgorithm) {
+	public MdmMatcherJson setAlgorithm(MdmMatcherEnum theAlgorithm) {
 		myAlgorithm = theAlgorithm;
 		return this;
 	}
@@ -52,7 +52,7 @@ public class EmpiMatcherJson  implements IModelJson {
 		return myIdentifierSystem;
 	}
 
-	public EmpiMatcherJson setIdentifierSystem(String theIdentifierSystem) {
+	public MdmMatcherJson setIdentifierSystem(String theIdentifierSystem) {
 		myIdentifierSystem = theIdentifierSystem;
 		return this;
 	}
@@ -61,7 +61,7 @@ public class EmpiMatcherJson  implements IModelJson {
 		return myExact;
 	}
 
-	public EmpiMatcherJson setExact(boolean theExact) {
+	public MdmMatcherJson setExact(boolean theExact) {
 		myExact = theExact;
 		return this;
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiResourceSearchParamJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java
similarity index 84%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiResourceSearchParamJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java
index 52c4c915310..61e9c99b029 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiResourceSearchParamJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -30,7 +30,7 @@ import java.util.List;
 /**
  *
  */
-public class EmpiResourceSearchParamJson implements IModelJson, Iterable<String> {
+public class MdmResourceSearchParamJson implements IModelJson, Iterable<String> {
 	@JsonProperty(value = "resourceType", required = true)
 	String myResourceType;
 	@JsonProperty(value = "searchParams", required = true)
@@ -40,7 +40,7 @@ public class EmpiResourceSearchParamJson implements IModelJson, Iterable<String>
 		return myResourceType;
 	}
 
-	public EmpiResourceSearchParamJson setResourceType(String theResourceType) {
+	public MdmResourceSearchParamJson setResourceType(String theResourceType) {
 		myResourceType = theResourceType;
 		return this;
 	}
@@ -49,7 +49,7 @@ public class EmpiResourceSearchParamJson implements IModelJson, Iterable<String>
 		return getSearchParams().iterator();
 	}
 
-	public EmpiResourceSearchParamJson addSearchParam(String theSearchParam) {
+	public MdmResourceSearchParamJson addSearchParam(String theSearchParam) {
 		getSearchParams().add(theSearchParam);
 		return this;
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiRulesJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java
similarity index 73%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiRulesJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java
index 6e9d83800f3..aa3c506ca93 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiRulesJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.rules.json;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import ca.uhn.fhir.model.api.IModelJson;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -34,18 +34,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@JsonDeserialize(converter = EmpiRulesJson.EmpiRulesJsonConverter.class)
-public class EmpiRulesJson implements IModelJson {
+@JsonDeserialize(converter = MdmRulesJson.EmpiRulesJsonConverter.class)
+public class MdmRulesJson implements IModelJson {
 	@JsonProperty(value = "version", required = true)
 	String myVersion;
 	@JsonProperty(value = "candidateSearchParams", required = true)
-	List<EmpiResourceSearchParamJson> myCandidateSearchParams = new ArrayList<>();
+	List<MdmResourceSearchParamJson> myCandidateSearchParams = new ArrayList<>();
 	@JsonProperty(value = "candidateFilterSearchParams", required = true)
-	List<EmpiFilterSearchParamJson> myCandidateFilterSearchParams = new ArrayList<>();
+	List<MdmFilterSearchParamJson> myCandidateFilterSearchParams = new ArrayList<>();
 	@JsonProperty(value = "matchFields", required = true)
-	List<EmpiFieldMatchJson> myMatchFieldJsonList = new ArrayList<>();
+	List<MdmFieldMatchJson> myMatchFieldJsonList = new ArrayList<>();
 	@JsonProperty(value = "matchResultMap", required = true)
-	Map<String, EmpiMatchResultEnum> myMatchResultMap = new HashMap<>();
+	Map<String, MdmMatchResultEnum> myMatchResultMap = new HashMap<>();
 	@JsonProperty(value = "eidSystem")
 	String myEnterpriseEIDSystem;
 
@@ -55,15 +55,15 @@ public class EmpiRulesJson implements IModelJson {
 
 	transient VectorMatchResultMap myVectorMatchResultMap;
 
-	public void addMatchField(EmpiFieldMatchJson theMatchRuleName) {
+	public void addMatchField(MdmFieldMatchJson theMatchRuleName) {
 		myMatchFieldJsonList.add(theMatchRuleName);
 	}
 
-	public void addResourceSearchParam(EmpiResourceSearchParamJson theSearchParam) {
+	public void addResourceSearchParam(MdmResourceSearchParamJson theSearchParam) {
 		myCandidateSearchParams.add(theSearchParam);
 	}
 
-	public void addFilterSearchParam(EmpiFilterSearchParamJson theSearchParam) {
+	public void addFilterSearchParam(MdmFilterSearchParamJson theSearchParam) {
 		myCandidateFilterSearchParams.add(theSearchParam);
 	}
 
@@ -71,24 +71,24 @@ public class EmpiRulesJson implements IModelJson {
 		return myMatchFieldJsonList.size();
 	}
 
-	EmpiFieldMatchJson get(int theIndex) {
+	MdmFieldMatchJson get(int theIndex) {
 		return myMatchFieldJsonList.get(theIndex);
 	}
 
-	EmpiMatchResultEnum getMatchResult(String theFieldMatchNames) {
+	MdmMatchResultEnum getMatchResult(String theFieldMatchNames) {
 		return myMatchResultMap.get(theFieldMatchNames);
 	}
 
-	public EmpiMatchResultEnum getMatchResult(Long theMatchVector) {
+	public MdmMatchResultEnum getMatchResult(Long theMatchVector) {
 		return myVectorMatchResultMap.get(theMatchVector);
 	}
 
-	public void putMatchResult(String theFieldMatchNames, EmpiMatchResultEnum theMatchResult) {
+	public void putMatchResult(String theFieldMatchNames, MdmMatchResultEnum theMatchResult) {
 		myMatchResultMap.put(theFieldMatchNames, theMatchResult);
 		initialize();
 	}
 
-	Map<String, EmpiMatchResultEnum> getMatchResultMap() {
+	Map<String, MdmMatchResultEnum> getMatchResultMap() {
 		return Collections.unmodifiableMap(myMatchResultMap);
 	}
 
@@ -99,15 +99,15 @@ public class EmpiRulesJson implements IModelJson {
 		myVectorMatchResultMap = new VectorMatchResultMap(this);
 	}
 
-	public List<EmpiFieldMatchJson> getMatchFields() {
+	public List<MdmFieldMatchJson> getMatchFields() {
 		return Collections.unmodifiableList(myMatchFieldJsonList);
 	}
 
-	public List<EmpiResourceSearchParamJson> getCandidateSearchParams() {
+	public List<MdmResourceSearchParamJson> getCandidateSearchParams() {
 		return Collections.unmodifiableList(myCandidateSearchParams);
 	}
 
-	public List<EmpiFilterSearchParamJson> getCandidateFilterSearchParams() {
+	public List<MdmFilterSearchParamJson> getCandidateFilterSearchParams() {
 		return Collections.unmodifiableList(myCandidateFilterSearchParams);
 	}
 
@@ -123,7 +123,7 @@ public class EmpiRulesJson implements IModelJson {
 		return myVersion;
 	}
 
-	public EmpiRulesJson setVersion(String theVersion) {
+	public MdmRulesJson setVersion(String theVersion) {
 		myVersion = theVersion;
 		return this;
 	}
@@ -163,7 +163,7 @@ public class EmpiRulesJson implements IModelJson {
 	/**
 	 * Ensure the vector map is initialized after we deserialize
 	 */
-	static class EmpiRulesJsonConverter extends StdConverter<EmpiRulesJson, EmpiRulesJson> {
+	static class EmpiRulesJsonConverter extends StdConverter<MdmRulesJson, MdmRulesJson> {
 
 		/**
 		 * This empty constructor is required by Jackson
@@ -172,10 +172,10 @@ public class EmpiRulesJson implements IModelJson {
 		}
 
 		@Override
-		public EmpiRulesJson convert(EmpiRulesJson theEmpiRulesJson) {
-			theEmpiRulesJson.validate();
-			theEmpiRulesJson.initialize();
-			return theEmpiRulesJson;
+		public MdmRulesJson convert(MdmRulesJson theMdmRulesJson) {
+			theMdmRulesJson.validate();
+			theMdmRulesJson.initialize();
+			return theMdmRulesJson;
 		}
 	}
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiSimilarityJson.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java
similarity index 73%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiSimilarityJson.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java
index e25613e0991..5d44aba62c6 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/EmpiSimilarityJson.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -21,17 +21,17 @@ package ca.uhn.fhir.empi.rules.json;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiMatchEvaluation;
-import ca.uhn.fhir.empi.rules.similarity.EmpiSimilarityEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchEvaluation;
+import ca.uhn.fhir.mdm.rules.similarity.MdmSimilarityEnum;
 import ca.uhn.fhir.model.api.IModelJson;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hl7.fhir.instance.model.api.IBase;
 
 import javax.annotation.Nullable;
 
-public class EmpiSimilarityJson  implements IModelJson {
+public class MdmSimilarityJson implements IModelJson {
 	@JsonProperty(value = "algorithm", required = true)
-	EmpiSimilarityEnum myAlgorithm;
+	MdmSimilarityEnum myAlgorithm;
 
 	@JsonProperty(value = "matchThreshold", required = true)
 	Double myMatchThreshold;
@@ -42,11 +42,11 @@ public class EmpiSimilarityJson  implements IModelJson {
 	@JsonProperty(value = "exact")
 	boolean myExact;
 
-	public EmpiSimilarityEnum getAlgorithm() {
+	public MdmSimilarityEnum getAlgorithm() {
 		return myAlgorithm;
 	}
 
-	public EmpiSimilarityJson setAlgorithm(EmpiSimilarityEnum theAlgorithm) {
+	public MdmSimilarityJson setAlgorithm(MdmSimilarityEnum theAlgorithm) {
 		myAlgorithm = theAlgorithm;
 		return this;
 	}
@@ -56,7 +56,7 @@ public class EmpiSimilarityJson  implements IModelJson {
 		return myMatchThreshold;
 	}
 
-	public EmpiSimilarityJson setMatchThreshold(double theMatchThreshold) {
+	public MdmSimilarityJson setMatchThreshold(double theMatchThreshold) {
 		myMatchThreshold = theMatchThreshold;
 		return this;
 	}
@@ -65,12 +65,12 @@ public class EmpiSimilarityJson  implements IModelJson {
 		return myExact;
 	}
 
-	public EmpiSimilarityJson setExact(boolean theExact) {
+	public MdmSimilarityJson setExact(boolean theExact) {
 		myExact = theExact;
 		return this;
 	}
 
-	public EmpiMatchEvaluation match(FhirContext theFhirContext, IBase theLeftValue, IBase theRightValue) {
+	public MdmMatchEvaluation match(FhirContext theFhirContext, IBase theLeftValue, IBase theRightValue) {
 		return myAlgorithm.match(theFhirContext, theLeftValue, theRightValue, myExact, myMatchThreshold);
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMap.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java
similarity index 71%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMap.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java
index b993832e095..96160b55fb9 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMap.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 /*-
  * #%L
@@ -21,7 +21,7 @@ package ca.uhn.fhir.empi.rules.json;
  */
 
 import ca.uhn.fhir.context.ConfigurationException;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 
 import javax.annotation.Nonnull;
 import java.util.HashMap;
@@ -30,46 +30,46 @@ import java.util.Map;
 import java.util.Set;
 
 public class VectorMatchResultMap {
-	private final EmpiRulesJson myEmpiRulesJson;
-	private Map<Long, EmpiMatchResultEnum> myVectorToMatchResultMap = new HashMap<>();
+	private final MdmRulesJson myMdmRulesJson;
+	private Map<Long, MdmMatchResultEnum> myVectorToMatchResultMap = new HashMap<>();
 	private Set<Long> myMatchVectors = new HashSet<>();
 	private Set<Long> myPossibleMatchVectors = new HashSet<>();
 	private Map<Long, String> myVectorToFieldMatchNamesMap = new HashMap<>();
 
-	VectorMatchResultMap(EmpiRulesJson theEmpiRulesJson) {
-		myEmpiRulesJson = theEmpiRulesJson;
+	VectorMatchResultMap(MdmRulesJson theMdmRulesJson) {
+		myMdmRulesJson = theMdmRulesJson;
 		//no reason to hold the entire empirulesjson here
 		initMap();
 	}
 
 	private void initMap() {
-		for (Map.Entry<String, EmpiMatchResultEnum> entry : myEmpiRulesJson.getMatchResultMap().entrySet()) {
+		for (Map.Entry<String, MdmMatchResultEnum> entry : myMdmRulesJson.getMatchResultMap().entrySet()) {
 			put(entry.getKey(), entry.getValue());
 		}
 	}
 
 	@Nonnull
-	public EmpiMatchResultEnum get(Long theMatchVector) {
+	public MdmMatchResultEnum get(Long theMatchVector) {
 		return myVectorToMatchResultMap.computeIfAbsent(theMatchVector, this::computeMatchResult);
 	}
 
-	private EmpiMatchResultEnum computeMatchResult(Long theVector) {
+	private MdmMatchResultEnum computeMatchResult(Long theVector) {
 		if (myMatchVectors.stream().anyMatch(v -> (v & theVector) == v)) {
-			return EmpiMatchResultEnum.MATCH;
+			return MdmMatchResultEnum.MATCH;
 		}
 		if (myPossibleMatchVectors.stream().anyMatch(v -> (v & theVector) == v)) {
-			return EmpiMatchResultEnum.POSSIBLE_MATCH;
+			return MdmMatchResultEnum.POSSIBLE_MATCH;
 		}
-		return EmpiMatchResultEnum.NO_MATCH;
+		return MdmMatchResultEnum.NO_MATCH;
 	}
 
-	private void put(String theFieldMatchNames, EmpiMatchResultEnum theMatchResult) {
+	private void put(String theFieldMatchNames, MdmMatchResultEnum theMatchResult) {
 		long vector = getVector(theFieldMatchNames);
 		myVectorToFieldMatchNamesMap.put(vector, theFieldMatchNames);
 		myVectorToMatchResultMap.put(vector, theMatchResult);
-		if (theMatchResult == EmpiMatchResultEnum.MATCH) {
+		if (theMatchResult == MdmMatchResultEnum.MATCH) {
 			myMatchVectors.add(vector);
-		} else if (theMatchResult == EmpiMatchResultEnum.POSSIBLE_MATCH) {
+		} else if (theMatchResult == MdmMatchResultEnum.POSSIBLE_MATCH) {
 			myPossibleMatchVectors.add(vector);
 		}
 	}
@@ -92,8 +92,8 @@ public class VectorMatchResultMap {
 	}
 
 	private int getFieldMatchIndex(final String theFieldMatchName) {
-		for (int i = 0; i < myEmpiRulesJson.size(); ++i) {
-			if (myEmpiRulesJson.get(i).getName().equals(theFieldMatchName)) {
+		for (int i = 0; i < myMdmRulesJson.size(); ++i) {
+			if (myMdmRulesJson.get(i).getName().equals(theFieldMatchName)) {
 				return i;
 			}
 		}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/BaseHapiStringMetric.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java
similarity index 96%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/BaseHapiStringMetric.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java
index b7e7fb4549d..15aefcd01c9 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/BaseHapiStringMetric.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java
similarity index 93%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java
index 10a0b5a33bc..60ced876d77 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -23,7 +23,7 @@ package ca.uhn.fhir.empi.rules.matcher;
 import ca.uhn.fhir.context.FhirContext;
 import org.hl7.fhir.instance.model.api.IBase;
 
-public class HapiDateMatcher implements IEmpiFieldMatcher {
+public class HapiDateMatcher implements IMdmFieldMatcher {
 	private final HapiDateMatcherDstu3 myHapiDateMatcherDstu3 = new HapiDateMatcherDstu3();
 	private final HapiDateMatcherR4 myHapiDateMatcherR4 = new HapiDateMatcherR4();
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcherDstu3.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java
similarity index 98%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcherDstu3.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java
index 212da13d12a..664a1f66df7 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcherDstu3.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcherR4.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java
similarity index 98%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcherR4.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java
index 1ada5926f8c..059682e512a 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiDateMatcherR4.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiStringMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java
similarity index 89%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiStringMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java
index 6279bd08943..6f91dd2e5b7 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/HapiStringMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -27,10 +27,10 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
 /**
  * Similarity measure for two IBase fields whose similarity can be measured by their String representations.
  */
-public class HapiStringMatcher extends BaseHapiStringMetric implements IEmpiFieldMatcher {
-	private final IEmpiStringMatcher myStringMatcher;
+public class HapiStringMatcher extends BaseHapiStringMetric implements IMdmFieldMatcher {
+	private final IMdmStringMatcher myStringMatcher;
 
-	public HapiStringMatcher(IEmpiStringMatcher theStringMatcher) {
+	public HapiStringMatcher(IMdmStringMatcher theStringMatcher) {
 		myStringMatcher = theStringMatcher;
 	}
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IEmpiFieldMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java
similarity index 93%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IEmpiFieldMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java
index 08061041bac..797ffc73737 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IEmpiFieldMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -26,6 +26,6 @@ import org.hl7.fhir.instance.model.api.IBase;
 /**
  * Measure how similar two IBase (resource fields) are to one another.  1.0 means identical.  0.0 means completely different.
  */
-public interface IEmpiFieldMatcher {
+public interface IMdmFieldMatcher {
 	boolean matches(FhirContext theFhirContext, IBase theLeftBase, IBase theRightBase, boolean theExact, String theIdentifierSystem);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IEmpiStringMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java
similarity index 90%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IEmpiStringMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java
index 49665c78ad4..b6874c1c044 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IEmpiStringMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -20,6 +20,6 @@ package ca.uhn.fhir.empi.rules.matcher;
  * #L%
  */
 
-public interface IEmpiStringMatcher {
+public interface IMdmStringMatcher {
 	boolean matches(String theLeftString, String theRightString);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IdentifierMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java
similarity index 88%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IdentifierMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java
index d79b4b73c8d..aa618f0fcec 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/IdentifierMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -21,11 +21,11 @@ package ca.uhn.fhir.empi.rules.matcher;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.util.CanonicalIdentifier;
-import ca.uhn.fhir.empi.util.IdentifierUtil;
+import ca.uhn.fhir.mdm.util.CanonicalIdentifier;
+import ca.uhn.fhir.mdm.util.IdentifierUtil;
 import org.hl7.fhir.instance.model.api.IBase;
 
-public class IdentifierMatcher implements IEmpiFieldMatcher {
+public class IdentifierMatcher implements IMdmFieldMatcher {
 	/**
 	 *
 	 * @return true if the two fhir identifiers are the same.  If @param theIdentifierSystem is not null, then the
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/EmpiMatcherEnum.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java
similarity index 89%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/EmpiMatcherEnum.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java
index 476179ecf79..33067255322 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/EmpiMatcherEnum.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -28,7 +28,7 @@ import org.hl7.fhir.instance.model.api.IBase;
  * Enum for holding all the known FHIR Element matchers that we support in HAPI.  The string matchers first
  * encode the string using an Apache Encoder before comparing them.  https://commons.apache.org/proper/commons-codec/userguide.html
  */
-public enum EmpiMatcherEnum {
+public enum MdmMatcherEnum {
 	CAVERPHONE1(new HapiStringMatcher(new PhoneticEncoderMatcher(PhoneticEncoderEnum.CAVERPHONE1))),
 	CAVERPHONE2(new HapiStringMatcher(new PhoneticEncoderMatcher(PhoneticEncoderEnum.CAVERPHONE2))),
 	COLOGNE(new HapiStringMatcher(new PhoneticEncoderMatcher(PhoneticEncoderEnum.COLOGNE))),
@@ -43,14 +43,14 @@ public enum EmpiMatcherEnum {
 	SUBSTRING(new HapiStringMatcher(new SubstringStringMatcher())),
 
 	DATE(new HapiDateMatcher()),
-	NAME_ANY_ORDER(new NameMatcher(EmpiPersonNameMatchModeEnum.ANY_ORDER)),
-	NAME_FIRST_AND_LAST(new NameMatcher(EmpiPersonNameMatchModeEnum.FIRST_AND_LAST)),
+	NAME_ANY_ORDER(new NameMatcher(MdmPersonNameMatchModeEnum.ANY_ORDER)),
+	NAME_FIRST_AND_LAST(new NameMatcher(MdmPersonNameMatchModeEnum.FIRST_AND_LAST)),
 
 	IDENTIFIER(new IdentifierMatcher());
 
-	private final IEmpiFieldMatcher myEmpiFieldMatcher;
+	private final IMdmFieldMatcher myEmpiFieldMatcher;
 
-	EmpiMatcherEnum(IEmpiFieldMatcher theEmpiFieldMatcher) {
+	MdmMatcherEnum(IMdmFieldMatcher theEmpiFieldMatcher) {
 		myEmpiFieldMatcher = theEmpiFieldMatcher;
 	}
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/EmpiPersonNameMatchModeEnum.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java
similarity index 89%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/EmpiPersonNameMatchModeEnum.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java
index 0766d867d47..233947f96c8 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/EmpiPersonNameMatchModeEnum.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.rules.matcher;
  * #L%
  */
 
-public enum EmpiPersonNameMatchModeEnum {
+public enum MdmPersonNameMatchModeEnum {
 	ANY_ORDER,
 	FIRST_AND_LAST
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/NameMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java
similarity index 88%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/NameMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java
index 1928c5a8a13..42ca49827a7 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/NameMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -21,7 +21,7 @@ package ca.uhn.fhir.empi.rules.matcher;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.util.NameUtil;
+import ca.uhn.fhir.mdm.util.NameUtil;
 import ca.uhn.fhir.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.instance.model.api.IBase;
@@ -32,11 +32,11 @@ import java.util.stream.Collectors;
 /**
  * Similarity measure for two IBase name fields
  */
-public class NameMatcher implements IEmpiFieldMatcher {
+public class NameMatcher implements IMdmFieldMatcher {
 
-	private final EmpiPersonNameMatchModeEnum myMatchMode;
+	private final MdmPersonNameMatchModeEnum myMatchMode;
 
-	public NameMatcher(EmpiPersonNameMatchModeEnum theMatchMode) {
+	public NameMatcher(MdmPersonNameMatchModeEnum theMatchMode) {
 		myMatchMode = theMatchMode;
 	}
 
@@ -63,7 +63,7 @@ public class NameMatcher implements IEmpiFieldMatcher {
 		for (String leftGivenName : leftGivenNames) {
 			for (String rightGivenName : rightGivenNames) {
 				match |= leftGivenName.equals(rightGivenName) && leftFamilyName.equals(rightFamilyName);
-				if (myMatchMode == EmpiPersonNameMatchModeEnum.ANY_ORDER) {
+				if (myMatchMode == MdmPersonNameMatchModeEnum.ANY_ORDER) {
 					match |= leftGivenName.equals(rightFamilyName) && leftFamilyName.equals(rightGivenName);
 				}
 			}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/PhoneticEncoderMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java
similarity index 92%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/PhoneticEncoderMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java
index 318c5174bde..08bfaf2dc08 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/PhoneticEncoderMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -25,7 +25,7 @@ import ca.uhn.fhir.context.phonetic.PhoneticEncoderEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PhoneticEncoderMatcher implements IEmpiStringMatcher {
+public class PhoneticEncoderMatcher implements IMdmStringMatcher {
 	private static final Logger ourLog = LoggerFactory.getLogger(PhoneticEncoderMatcher.class);
 
 	private final IPhoneticEncoder myStringEncoder;
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/SubstringStringMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java
similarity index 89%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/SubstringStringMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java
index 92baab6720e..2e009d7d646 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/matcher/SubstringStringMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 /*-
  * #%L
@@ -20,7 +20,7 @@ package ca.uhn.fhir.empi.rules.matcher;
  * #L%
  */
 
-public class SubstringStringMatcher implements IEmpiStringMatcher {
+public class SubstringStringMatcher implements IMdmStringMatcher {
 	@Override
 	public boolean matches(String theLeftString, String theRightString) {
 		return theLeftString.startsWith(theRightString) || theRightString.startsWith(theLeftString);
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/HapiStringSimilarity.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java
similarity index 92%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/HapiStringSimilarity.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java
index aea535228a5..73a2f1cf4c6 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/HapiStringSimilarity.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.similarity;
+package ca.uhn.fhir.mdm.rules.similarity;
 
 /*-
  * #%L
@@ -21,7 +21,7 @@ package ca.uhn.fhir.empi.rules.similarity;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.rules.matcher.BaseHapiStringMetric;
+import ca.uhn.fhir.mdm.rules.matcher.BaseHapiStringMetric;
 import info.debatty.java.stringsimilarity.interfaces.NormalizedStringSimilarity;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
@@ -29,7 +29,7 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
 /**
  * Similarity measure for two IBase fields whose similarity can be measured by their String representations.
  */
-public class HapiStringSimilarity extends BaseHapiStringMetric implements IEmpiFieldSimilarity {
+public class HapiStringSimilarity extends BaseHapiStringMetric implements IMdmFieldSimilarity {
 	private final NormalizedStringSimilarity myStringSimilarity;
 
 	public HapiStringSimilarity(NormalizedStringSimilarity theStringSimilarity) {
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/IEmpiFieldSimilarity.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java
similarity index 92%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/IEmpiFieldSimilarity.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java
index 0ef6c4bc4ea..e73801b4e5c 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/IEmpiFieldSimilarity.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.similarity;
+package ca.uhn.fhir.mdm.rules.similarity;
 
 /*-
  * #%L
@@ -26,6 +26,6 @@ import org.hl7.fhir.instance.model.api.IBase;
 /**
  * Measure how similar two IBase (resource fields) are to one another.  1.0 means identical.  0.0 means completely different.
  */
-public interface IEmpiFieldSimilarity {
+public interface IMdmFieldSimilarity {
 	double similarity(FhirContext theFhirContext, IBase theLeftBase, IBase theRightBase, boolean theExact);
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/EmpiSimilarityEnum.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java
similarity index 71%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/EmpiSimilarityEnum.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java
index d064a5fb369..f77e630de6b 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/similarity/EmpiSimilarityEnum.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.similarity;
+package ca.uhn.fhir.mdm.rules.similarity;
 
 /*-
  * #%L
@@ -21,7 +21,7 @@ package ca.uhn.fhir.empi.rules.similarity;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiMatchEvaluation;
+import ca.uhn.fhir.mdm.api.MdmMatchEvaluation;
 import info.debatty.java.stringsimilarity.Cosine;
 import info.debatty.java.stringsimilarity.Jaccard;
 import info.debatty.java.stringsimilarity.JaroWinkler;
@@ -31,25 +31,25 @@ import org.hl7.fhir.instance.model.api.IBase;
 
 import javax.annotation.Nullable;
 
-public enum EmpiSimilarityEnum {
+public enum MdmSimilarityEnum {
 	JARO_WINKLER(new HapiStringSimilarity(new JaroWinkler())),
 	COSINE(new HapiStringSimilarity(new Cosine())),
 	JACCARD(new HapiStringSimilarity(new Jaccard())),
 	LEVENSCHTEIN(new HapiStringSimilarity(new NormalizedLevenshtein())),
 	SORENSEN_DICE(new HapiStringSimilarity(new SorensenDice()));
 
-	private final IEmpiFieldSimilarity myEmpiFieldSimilarity;
+	private final IMdmFieldSimilarity myEmpiFieldSimilarity;
 
-	EmpiSimilarityEnum(IEmpiFieldSimilarity theEmpiFieldSimilarity) {
+	MdmSimilarityEnum(IMdmFieldSimilarity theEmpiFieldSimilarity) {
 		myEmpiFieldSimilarity = theEmpiFieldSimilarity;
 	}
 
-	public EmpiMatchEvaluation match(FhirContext theFhirContext, IBase theLeftBase, IBase theRightBase, boolean theExact, @Nullable Double theThreshold) {
+	public MdmMatchEvaluation match(FhirContext theFhirContext, IBase theLeftBase, IBase theRightBase, boolean theExact, @Nullable Double theThreshold) {
 		return matchBySimilarity(myEmpiFieldSimilarity, theFhirContext, theLeftBase, theRightBase, theExact, theThreshold);
 	}
 
-	private EmpiMatchEvaluation matchBySimilarity(IEmpiFieldSimilarity theSimilarity, FhirContext theFhirContext, IBase theLeftBase, IBase theRightBase, boolean theExact, Double theThreshold) {
+	private MdmMatchEvaluation matchBySimilarity(IMdmFieldSimilarity theSimilarity, FhirContext theFhirContext, IBase theLeftBase, IBase theRightBase, boolean theExact, Double theThreshold) {
 		double similarityResult = theSimilarity.similarity(theFhirContext, theLeftBase, theRightBase, theExact);
-		return new EmpiMatchEvaluation(similarityResult >= theThreshold, similarityResult);
+		return new MdmMatchEvaluation(similarityResult >= theThreshold, similarityResult);
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcher.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java
similarity index 66%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcher.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java
index aa124cc5ee6..a384f1756bf 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcher.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.svc;
+package ca.uhn.fhir.mdm.rules.svc;
 
 /*-
  * #%L
@@ -21,9 +21,9 @@ package ca.uhn.fhir.empi.rules.svc;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiMatchEvaluation;
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
+import ca.uhn.fhir.mdm.api.MdmMatchEvaluation;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 import ca.uhn.fhir.util.FhirTerser;
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.instance.model.api.IBase;
@@ -32,26 +32,26 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static ca.uhn.fhir.empi.api.EmpiConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE;
+import static ca.uhn.fhir.mdm.api.MdmConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE;
 
 /**
  * This class is responsible for performing matching between raw-typed values of a left record and a right record.
  */
-public class EmpiResourceFieldMatcher {
+public class MdmResourceFieldMatcher {
 	private final FhirContext myFhirContext;
-	private final EmpiFieldMatchJson myEmpiFieldMatchJson;
+	private final MdmFieldMatchJson myMdmFieldMatchJson;
 	private final String myResourceType;
 	private final String myResourcePath;
-	private final EmpiRulesJson myEmpiRulesJson;
+	private final MdmRulesJson myMdmRulesJson;
 	private final String myName;
 
-	public EmpiResourceFieldMatcher(FhirContext theFhirContext, EmpiFieldMatchJson theEmpiFieldMatchJson, EmpiRulesJson theEmpiRulesJson) {
+	public MdmResourceFieldMatcher(FhirContext theFhirContext, MdmFieldMatchJson theMdmFieldMatchJson, MdmRulesJson theMdmRulesJson) {
 		myFhirContext = theFhirContext;
-		myEmpiFieldMatchJson = theEmpiFieldMatchJson;
-		myResourceType = theEmpiFieldMatchJson.getResourceType();
-		myResourcePath = theEmpiFieldMatchJson.getResourcePath();
-		myName = theEmpiFieldMatchJson.getName();
-		myEmpiRulesJson = theEmpiRulesJson;
+		myMdmFieldMatchJson = theMdmFieldMatchJson;
+		myResourceType = theMdmFieldMatchJson.getResourceType();
+		myResourcePath = theMdmFieldMatchJson.getResourcePath();
+		myName = theMdmFieldMatchJson.getName();
+		myMdmRulesJson = theMdmRulesJson;
 	}
 
 	/**
@@ -65,7 +65,7 @@ public class EmpiResourceFieldMatcher {
 	 * @return A boolean indicating whether they match.
 	 */
 	@SuppressWarnings("rawtypes")
-	public EmpiMatchEvaluation match(IBaseResource theLeftResource, IBaseResource theRightResource) {
+	public MdmMatchEvaluation match(IBaseResource theLeftResource, IBaseResource theRightResource) {
 		validate(theLeftResource);
 		validate(theRightResource);
 
@@ -76,19 +76,19 @@ public class EmpiResourceFieldMatcher {
 	}
 
 	@SuppressWarnings("rawtypes")
-	private EmpiMatchEvaluation match(List<IBase> theLeftValues, List<IBase> theRightValues) {
-		EmpiMatchEvaluation retval = new EmpiMatchEvaluation(false, 0.0);
+	private MdmMatchEvaluation match(List<IBase> theLeftValues, List<IBase> theRightValues) {
+		MdmMatchEvaluation retval = new MdmMatchEvaluation(false, 0.0);
 		for (IBase leftValue : theLeftValues) {
 			for (IBase rightValue : theRightValues) {
-				EmpiMatchEvaluation nextMatch = match(leftValue, rightValue);
-				retval = EmpiMatchEvaluation.max(retval, nextMatch);
+				MdmMatchEvaluation nextMatch = match(leftValue, rightValue);
+				retval = MdmMatchEvaluation.max(retval, nextMatch);
 			}
 		}
 		return retval;
 	}
 
-	private EmpiMatchEvaluation match(IBase theLeftValue, IBase theRightValue) {
-		return myEmpiFieldMatchJson.match(myFhirContext, theLeftValue, theRightValue);
+	private MdmMatchEvaluation match(IBase theLeftValue, IBase theRightValue) {
+		return myMdmFieldMatchJson.match(myFhirContext, theLeftValue, theRightValue);
 	}
 
 	private void validate(IBaseResource theResource) {
@@ -96,8 +96,8 @@ public class EmpiResourceFieldMatcher {
 		Validate.notNull(resourceType, "Resource type may not be null");
 
 		if (ALL_RESOURCE_SEARCH_PARAM_TYPE.equals(myResourceType)) {
-			boolean isMdmType = myEmpiRulesJson.getMdmTypes().stream().anyMatch(mdmType -> mdmType.equalsIgnoreCase(resourceType));
-			Validate.isTrue(isMdmType, "Expecting resource type %s, got resource type %s", myEmpiRulesJson.getMdmTypes().stream().collect(Collectors.joining(",")), resourceType);
+			boolean isMdmType = myMdmRulesJson.getMdmTypes().stream().anyMatch(mdmType -> mdmType.equalsIgnoreCase(resourceType));
+			Validate.isTrue(isMdmType, "Expecting resource type %s, got resource type %s", myMdmRulesJson.getMdmTypes().stream().collect(Collectors.joining(",")), resourceType);
 		} else {
 			Validate.isTrue(myResourceType.equals(resourceType), "Expecting resource type %s got resource type %s", myResourceType, resourceType);
 		}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java
similarity index 60%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvc.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java
index 530043c89e1..3c168c7ddc0 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.svc;
+package ca.uhn.fhir.mdm.rules.svc;
 
 /*-
  * #%L
@@ -22,14 +22,14 @@ package ca.uhn.fhir.empi.rules.svc;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiMatchEvaluation;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmMatchEvaluation;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,60 +40,60 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The EmpiResourceComparator is in charge of performing actual comparisons between left and right records.
+ * The MdmResourceComparator is in charge of performing actual comparisons between left and right records.
  * It does so by calling individual comparators, and returning a vector based on the combination of
  * field comparators that matched.
  */
 
 @Service
-public class EmpiResourceMatcherSvc {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class MdmResourceMatcherSvc {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	private final FhirContext myFhirContext;
-	private final IEmpiSettings myEmpiSettings;
-	private EmpiRulesJson myEmpiRulesJson;
-	private final List<EmpiResourceFieldMatcher> myFieldMatchers = new ArrayList<>();
+	private final IMdmSettings myMdmSettings;
+	private MdmRulesJson myMdmRulesJson;
+	private final List<MdmResourceFieldMatcher> myFieldMatchers = new ArrayList<>();
 
 	@Autowired
-	public EmpiResourceMatcherSvc(FhirContext theFhirContext, IEmpiSettings theEmpiSettings) {
+	public MdmResourceMatcherSvc(FhirContext theFhirContext, IMdmSettings theMdmRules) {
 		myFhirContext = theFhirContext;
-		myEmpiSettings = theEmpiSettings;
+		myMdmSettings = theMdmRules;
 	}
 
 	@PostConstruct
 	public void init() {
-		myEmpiRulesJson = myEmpiSettings.getEmpiRules();
-		if (myEmpiRulesJson == null) {
-			throw new ConfigurationException("Failed to load EMPI Rules.  If EMPI is enabled, then EMPI rules must be available in context.");
+		myMdmRulesJson = myMdmSettings.getMdmRules();
+		if (myMdmRulesJson == null) {
+			throw new ConfigurationException("Failed to load MDM Rules.  If MDM is enabled, then MDM rules must be available in context.");
 		}
-		for (EmpiFieldMatchJson matchFieldJson : myEmpiRulesJson.getMatchFields()) {
-			myFieldMatchers.add(new EmpiResourceFieldMatcher( myFhirContext, matchFieldJson, myEmpiRulesJson));
+		for (MdmFieldMatchJson matchFieldJson : myMdmRulesJson.getMatchFields()) {
+			myFieldMatchers.add(new MdmResourceFieldMatcher( myFhirContext, matchFieldJson, myMdmRulesJson));
 		}
 
 	}
 
 	/**
-	 * Given two {@link IBaseResource}s, perform all comparisons on them to determine an {@link EmpiMatchResultEnum}, indicating
+	 * Given two {@link IBaseResource}s, perform all comparisons on them to determine an {@link MdmMatchResultEnum}, indicating
 	 * to what level the two resources are considered to be matching.
 	 *
 	 * @param theLeftResource The first {@link IBaseResource}.
 	 * @param theRightResource The second {@link IBaseResource}
 	 *
-	 * @return an {@link EmpiMatchResultEnum} indicating the result of the comparison.
+	 * @return an {@link MdmMatchResultEnum} indicating the result of the comparison.
 	 */
-	public EmpiMatchOutcome getMatchResult(IBaseResource theLeftResource, IBaseResource theRightResource) {
+	public MdmMatchOutcome getMatchResult(IBaseResource theLeftResource, IBaseResource theRightResource) {
 		return match(theLeftResource, theRightResource);
 	}
 
-	EmpiMatchOutcome match(IBaseResource theLeftResource, IBaseResource theRightResource) {
-		EmpiMatchOutcome matchResult = getMatchOutcome(theLeftResource, theRightResource);
-		EmpiMatchResultEnum matchResultEnum = myEmpiRulesJson.getMatchResult(matchResult.vector);
+	MdmMatchOutcome match(IBaseResource theLeftResource, IBaseResource theRightResource) {
+		MdmMatchOutcome matchResult = getMatchOutcome(theLeftResource, theRightResource);
+		MdmMatchResultEnum matchResultEnum = myMdmRulesJson.getMatchResult(matchResult.vector);
 		matchResult.setMatchResultEnum(matchResultEnum);
 		if (ourLog.isDebugEnabled()) {
 			if (matchResult.isMatch() || matchResult.isPossibleMatch()) {
-				ourLog.debug("{} {} with field matchers {}", matchResult, theRightResource.getIdElement().toUnqualifiedVersionless(), myEmpiRulesJson.getFieldMatchNamesForVector(matchResult.vector));
+				ourLog.debug("{} {} with field matchers {}", matchResult, theRightResource.getIdElement().toUnqualifiedVersionless(), myMdmRulesJson.getFieldMatchNamesForVector(matchResult.vector));
 			} else if (ourLog.isTraceEnabled()) {
-				ourLog.trace("{} {}.  Field matcher results: {}", matchResult, theRightResource.getIdElement().toUnqualifiedVersionless(), myEmpiRulesJson.getDetailedFieldMatchResultForUnmatchedVector(matchResult.vector));
+				ourLog.trace("{} {}.  Field matcher results: {}", matchResult, theRightResource.getIdElement().toUnqualifiedVersionless(), myMdmRulesJson.getDetailedFieldMatchResultForUnmatchedVector(matchResult.vector));
 			}
 		}
 		return matchResult;
@@ -114,7 +114,7 @@ public class EmpiResourceMatcherSvc {
 	 * 0001|0010 = 0011
 	 * The binary string is now `0011`, which when you return it as a long becomes `3`.
 	 */
-	private EmpiMatchOutcome getMatchOutcome(IBaseResource theLeftResource, IBaseResource theRightResource) {
+	private MdmMatchOutcome getMatchOutcome(IBaseResource theLeftResource, IBaseResource theRightResource) {
 		long vector = 0;
 		double score = 0.0;
 		int appliedRuleCount = 0;
@@ -126,13 +126,13 @@ public class EmpiResourceMatcherSvc {
 
 		for (int i = 0; i < myFieldMatchers.size(); ++i) {
 			//any that are not for the resourceType in question.
-			EmpiResourceFieldMatcher fieldComparator = myFieldMatchers.get(i);
+			MdmResourceFieldMatcher fieldComparator = myFieldMatchers.get(i);
 			if (!isValidResourceType(resourceType, fieldComparator.getResourceType())) {
 				ourLog.debug("Matcher {} is not valid for resource type: {}. Skipping it.", fieldComparator.getName(), resourceType);
 				continue;
 			} else {
 				ourLog.debug("Matcher {} is valid for resource type: {}. Evaluating match.", fieldComparator.getName(), resourceType);
-				EmpiMatchEvaluation matchEvaluation = fieldComparator.match(theLeftResource, theRightResource);
+				MdmMatchEvaluation matchEvaluation = fieldComparator.match(theLeftResource, theRightResource);
 				if (matchEvaluation.match) {
 					vector |= (1 << i);
 				}
@@ -141,14 +141,14 @@ public class EmpiResourceMatcherSvc {
 			}
 		}
 
-		EmpiMatchOutcome retVal = new EmpiMatchOutcome(vector, score);
-		retVal.setEmpiRuleCount(appliedRuleCount);
+		MdmMatchOutcome retVal = new MdmMatchOutcome(vector, score);
+		retVal.setMdmRuleCount(appliedRuleCount);
 		return retVal;
 	}
 
 	private boolean isValidResourceType(String theResourceType, String theFieldComparatorType) {
 		return (
-			theFieldComparatorType.equalsIgnoreCase(EmpiConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE)
+			theFieldComparatorType.equalsIgnoreCase(MdmConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE)
 			|| theFieldComparatorType.equalsIgnoreCase(theResourceType)
 		);
 	}
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/AssuranceLevelUtil.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java
similarity index 85%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/AssuranceLevelUtil.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java
index 7e6bb7ef851..69da8ea00b0 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/AssuranceLevelUtil.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
@@ -20,9 +20,9 @@ package ca.uhn.fhir.empi.util;
  * #L%
  */
 
-import ca.uhn.fhir.empi.api.EmpiLinkSourceEnum;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel;
+import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.model.CanonicalIdentityAssuranceLevel;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 /**
@@ -34,7 +34,7 @@ public final class AssuranceLevelUtil {
 	private AssuranceLevelUtil() {
 	}
 
-	public static CanonicalIdentityAssuranceLevel getAssuranceLevel(EmpiMatchResultEnum theMatchResult, EmpiLinkSourceEnum theSource) {
+	public static CanonicalIdentityAssuranceLevel getAssuranceLevel(MdmMatchResultEnum theMatchResult, MdmLinkSourceEnum theSource) {
 		switch (theSource) {
 			case MANUAL:
 				return getAssuranceFromManualResult(theMatchResult);
@@ -44,7 +44,7 @@ public final class AssuranceLevelUtil {
 		throw new InvalidRequestException("Couldn't figure out an assurance level for result: " + theMatchResult + " and source " + theSource);
 	}
 
-	private static CanonicalIdentityAssuranceLevel getAssuranceFromAutoResult(EmpiMatchResultEnum theMatchResult) {
+	private static CanonicalIdentityAssuranceLevel getAssuranceFromAutoResult(MdmMatchResultEnum theMatchResult) {
 		switch (theMatchResult) {
 			case MATCH:
 				return CanonicalIdentityAssuranceLevel.LEVEL2;
@@ -57,7 +57,7 @@ public final class AssuranceLevelUtil {
 		}
 	}
 
-	private static CanonicalIdentityAssuranceLevel getAssuranceFromManualResult(EmpiMatchResultEnum theMatchResult) {
+	private static CanonicalIdentityAssuranceLevel getAssuranceFromManualResult(MdmMatchResultEnum theMatchResult) {
 		switch (theMatchResult) {
 			case MATCH:
 			case REDIRECT:
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/CanonicalIdentifier.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java
similarity index 98%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/CanonicalIdentifier.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java
index 960b4be9998..c641fdb270e 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/CanonicalIdentifier.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EIDHelper.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java
similarity index 85%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EIDHelper.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java
index ff6141f1fb8..307cb704fc7 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EIDHelper.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
@@ -21,9 +21,9 @@ package ca.uhn.fhir.empi.util;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.model.CanonicalEID;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,17 +37,17 @@ import java.util.stream.Collectors;
 @Service
 public final class EIDHelper {
 	private final FhirContext myFhirContext;
-	private final IEmpiSettings myEmpiConfig;
+	private final IMdmSettings myMdmSettings;
 
 	@Autowired
-	public EIDHelper(FhirContext theFhirContext, IEmpiSettings theEmpiConfig) {
+	public EIDHelper(FhirContext theFhirContext, IMdmSettings theMdmSettings) {
 		myFhirContext = theFhirContext;
-		myEmpiConfig = theEmpiConfig;
+		myMdmSettings = theMdmSettings;
 	}
 
 	public CanonicalEID createHapiEid() {
 		return new CanonicalEID(
-			EmpiConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM,
+			MdmConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM,
 			UUID.randomUUID().toString(),
 			null
 		);
@@ -62,7 +62,7 @@ public final class EIDHelper {
 	 * @return An optional {@link CanonicalEID} representing the external EID. Absent if the EID is not present.
 	 */
 	public List<CanonicalEID> getExternalEid(IBaseResource theResource) {
-		return CanonicalEID.extractFromResource(myFhirContext, myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem(), theResource);
+		return CanonicalEID.extractFromResource(myFhirContext, myMdmSettings.getMdmRules().getEnterpriseEIDSystem(), theResource);
 	}
 
 	/**
@@ -74,7 +74,7 @@ public final class EIDHelper {
 	 * @return An optional {@link CanonicalEID} representing the internal EID. Absent if the EID is not present.
 	 */
 	public List<CanonicalEID> getHapiEid(IAnyResource theResource) {
-		return CanonicalEID.extractFromResource(myFhirContext, EmpiConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM, theResource);
+		return CanonicalEID.extractFromResource(myFhirContext, MdmConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM, theResource);
 	}
 
 	/**
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java
similarity index 95%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java
index 46f2a8c4b78..fa3d4d1c056 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
@@ -25,12 +25,11 @@ import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.empi.api.IEmpiLinkQuerySvc;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
-import ca.uhn.fhir.empi.log.Logs;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel;
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
+import ca.uhn.fhir.mdm.log.Logs;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.model.CanonicalIdentityAssuranceLevel;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 import ca.uhn.fhir.fhirpath.IFhirPath;
 import ca.uhn.fhir.util.FhirTerser;
 import org.hl7.fhir.instance.model.api.IAnyResource;
@@ -62,22 +61,21 @@ import static ca.uhn.fhir.context.FhirVersionEnum.DSTU3;
 import static ca.uhn.fhir.context.FhirVersionEnum.R4;
 
 @Service
-public class PersonHelper {
-	private static final Logger ourLog = Logs.getEmpiTroubleshootingLog();
+public class GoldenResourceHelper {
+	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	private static final String FIELD_NAME_IDENTIFIER = "identifier";
 
 	@Autowired
-	private IEmpiSettings myEmpiConfig;
+	private IMdmSettings myMdmSettings;
 	@Autowired
 	private EIDHelper myEIDHelper;
 
-	private IEmpiLinkQuerySvc queyr;
 
 	private final FhirContext myFhirContext;
 
 	@Autowired
-	public PersonHelper(FhirContext theFhirContext) {
+	public GoldenResourceHelper(FhirContext theFhirContext) {
 		myFhirContext = theFhirContext;
 	}
 
@@ -102,10 +100,8 @@ public class PersonHelper {
 
 		addHapiEidIfNoExternalEidIsPresent(newSourceResource, sourceResourceIdentifier, theIncomingResource);
 
-		//setGoldenResource(newSourceResource, resourceDefinition, true);
-
-		EmpiUtil.setEmpiManaged(newSourceResource);
-		EmpiUtil.setGoldenResource(newSourceResource);
+		MdmUtil.setEmpiManaged(newSourceResource);
+		MdmUtil.setGoldenResource(newSourceResource);
 
 		return (T) newSourceResource;
 	}
@@ -196,7 +192,7 @@ public class PersonHelper {
 		for (IBase base : sourceResourceIdentifiers) {
 			Optional<IPrimitiveType> system = fhirPath.evaluateFirst(base, "system", IPrimitiveType.class);
 			if (system.isPresent()) {
-				String empiSystem = myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem();
+				String empiSystem = myMdmSettings.getMdmRules().getEnterpriseEIDSystem();
 				String baseSystem = system.get().getValueAsString();
 				if (Objects.equals(baseSystem, empiSystem)) {
 					cloneEidIntoResource(theSourceResourceIdentifier, base, theNewSourceResource);
@@ -234,7 +230,7 @@ public class PersonHelper {
 		List<CanonicalEID> personOfficialEid = myEIDHelper.getExternalEid(theSourceResource);
 
 		if (!incomingTargetEid.isEmpty()) {
-			if (personOfficialEid.isEmpty() || !myEmpiConfig.isPreventMultipleEids()) {
+			if (personOfficialEid.isEmpty() || !myMdmSettings.isPreventMultipleEids()) {
 				log(theMdmTransactionContext, "Incoming resource:" + theTargetResource.getIdElement().toUnqualifiedVersionless() + " + with EID " + incomingTargetEid.stream().map(CanonicalEID::toString).collect(Collectors.joining(",")) + " is applying this EIDs to its related Source Resource, as this Source Resource does not yet have an external EID");
 				addCanonicalEidsToSourceResourceIfAbsent(theSourceResource, incomingTargetEid);
 			} else if (!personOfficialEid.isEmpty() && myEIDHelper.eidMatchExists(personOfficialEid, incomingTargetEid)) {
@@ -261,7 +257,7 @@ public class PersonHelper {
 		for (IBase base : sourceResourceIdentifiers) {
 			Optional<IPrimitiveType> system = fhirPath.evaluateFirst(base, "system", IPrimitiveType.class);
 			if (system.isPresent()) {
-				String empiSystem = myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem();
+				String empiSystem = myMdmSettings.getMdmRules().getEnterpriseEIDSystem();
 				String baseSystem = system.get().getValueAsString();
 				if (Objects.equals(baseSystem, empiSystem)) {
 					if (ourLog.isDebugEnabled()) {
@@ -504,10 +500,10 @@ public class PersonHelper {
 	}
 
 	public void deactivateResource(IAnyResource theResource) {
-		EmpiUtil.setGoldenResourceRedirected(theResource);
+		MdmUtil.setGoldenResourceRedirected(theResource);
 	}
 
 	public boolean isDeactivated(IBaseResource theGoldenResource) {
-		return EmpiUtil.isGoldenRecordRedirected(theGoldenResource);
+		return MdmUtil.isGoldenRecordRedirected(theGoldenResource);
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/IdentifierUtil.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java
similarity index 96%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/IdentifierUtil.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java
index b161b65dc82..529e1b8ecc7 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/IdentifierUtil.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
@@ -20,7 +20,6 @@ package ca.uhn.fhir.empi.util;
  * #L%
  */
 
-import ca.uhn.fhir.rest.param.StringParam;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import org.hl7.fhir.instance.model.api.IBase;
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EmpiUtil.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java
similarity index 67%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EmpiUtil.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java
index 8128d69d12f..31e5ad8f0b3 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EmpiUtil.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
@@ -21,18 +21,18 @@ package ca.uhn.fhir.empi.util;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
+import ca.uhn.fhir.mdm.api.MdmConstants;
 import org.hl7.fhir.instance.model.api.IBaseCoding;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import javax.annotation.Nonnull;
 import java.util.Optional;
 
-public final class EmpiUtil {
-	private EmpiUtil() {}
+public final class MdmUtil {
+	private MdmUtil() {}
 
 
-	public static boolean isEmpiResourceType(FhirContext theFhirContext, IBaseResource theResource) {
+	public static boolean isMdmResourceType(FhirContext theFhirContext, IBaseResource theResource) {
 		String resourceType = theFhirContext.getResourceType(theResource);
 		return ("Patient".equals(resourceType) ||
 			"Practitioner".equals(resourceType)) ||
@@ -44,8 +44,8 @@ public final class EmpiUtil {
 	 * @param theBaseResource The Patient/Practitioner that is potentially managed by EMPI.
 	 * @return A boolean indicating whether EMPI should manage this resource.
 	 */
-	public static boolean isEmpiAccessible(IBaseResource theBaseResource) {
-		return theBaseResource.getMeta().getTag(EmpiConstants.SYSTEM_MDM_MANAGED, EmpiConstants.CODE_NO_EMPI_MANAGED) == null;
+	public static boolean isMdmAllowed(IBaseResource theBaseResource) {
+		return theBaseResource.getMeta().getTag(MdmConstants.SYSTEM_MDM_MANAGED, MdmConstants.CODE_NO_MDM_MANAGED) == null;
 	}
 
 	/**
@@ -55,22 +55,34 @@ public final class EmpiUtil {
 	 * @param theBaseResource the resource to check.
 	 * @return a boolean indicating whether or not EMPI manages this Person.
 	 */
-	public static boolean isEmpiManaged(IBaseResource theBaseResource) {
-		return resourceHasTag(theBaseResource, EmpiConstants.SYSTEM_MDM_MANAGED, EmpiConstants.CODE_HAPI_MDM_MANAGED);
+	public static boolean isMdmManaged(IBaseResource theBaseResource) {
+		return resourceHasTag(theBaseResource, MdmConstants.SYSTEM_MDM_MANAGED, MdmConstants.CODE_HAPI_MDM_MANAGED);
 	}
 
 	public static boolean isGoldenRecord(IBaseResource theBaseResource) {
-		return resourceHasTag(theBaseResource, EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, EmpiConstants.CODE_GOLDEN_RECORD);
+		return resourceHasTag(theBaseResource, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD);
+	}
+
+	public static boolean hasGoldenRecordSystemTag(IBaseResource theIBaseResource) {
+		return resourceHasTagWithSystem(theIBaseResource, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS);
+	}
+
+	public static boolean containsTagWithSystem(IBaseResource theBaseResource) {
+		return resourceHasTagWithSystem(theBaseResource, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS);
 	}
 
 	public static boolean isGoldenRecordRedirected(IBaseResource theBaseResource) {
-		return resourceHasTag(theBaseResource, EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, EmpiConstants.CODE_GOLDEN_RECORD_REDIRECTED);
+		return resourceHasTag(theBaseResource, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD_REDIRECTED);
 	}
 
 	private static boolean resourceHasTag(IBaseResource theTheBaseResource, String theSystem, String theCode) {
 		return theTheBaseResource.getMeta().getTag(theSystem, theCode) != null;
 	}
 
+	private static boolean resourceHasTagWithSystem(IBaseResource theTheBaseResource, String theSystem) {
+		return theTheBaseResource.getMeta().getTag().stream().anyMatch(tag -> tag.getSystem().equalsIgnoreCase(theSystem));
+	}
+
 	private static Optional<? extends IBaseCoding> getTagWithSystem(IBaseResource theResource, String theSystem) {
 		return theResource.getMeta().getTag().stream().filter(tag -> tag.getSystem().equalsIgnoreCase(theSystem)).findFirst();
 	}
@@ -89,15 +101,15 @@ public final class EmpiUtil {
 	 * 		Returns resource with the tag set.
 	 */
 	public static IBaseResource setEmpiManaged(IBaseResource theBaseResource) {
-		return setTagOnResource(theBaseResource, EmpiConstants.SYSTEM_MDM_MANAGED, EmpiConstants.CODE_HAPI_MDM_MANAGED, EmpiConstants.DISPLAY_HAPI_EMPI_MANAGED);
+		return setTagOnResource(theBaseResource, MdmConstants.SYSTEM_MDM_MANAGED, MdmConstants.CODE_HAPI_MDM_MANAGED, MdmConstants.DISPLAY_HAPI_MDM_MANAGED);
 	}
 
 	public static IBaseResource setGoldenResource(IBaseResource theBaseResource) {
-		return setTagOnResource(theBaseResource, EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, EmpiConstants.CODE_GOLDEN_RECORD, EmpiConstants.DISPLAY_GOLDEN_RECORD);
+		return setTagOnResource(theBaseResource, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD, MdmConstants.DISPLAY_GOLDEN_RECORD);
 	}
 
 	public static IBaseResource setGoldenResourceRedirected(IBaseResource theBaseResource) {
-		return setTagOnResource(theBaseResource, EmpiConstants.SYSTEM_GOLDEN_RECORD_STATUS, EmpiConstants.CODE_GOLDEN_RECORD_REDIRECTED, EmpiConstants.DISPLAY_GOLDEN_REDIRECT);
+		return setTagOnResource(theBaseResource, MdmConstants.SYSTEM_GOLDEN_RECORD_STATUS, MdmConstants.CODE_GOLDEN_RECORD_REDIRECTED, MdmConstants.DISPLAY_GOLDEN_REDIRECT);
 	}
 
 	/**
@@ -125,6 +137,6 @@ public final class EmpiUtil {
 	public static boolean isEmpiManagedPerson(FhirContext theFhirContext, IBaseResource theResource) {
 		String resourceType = theFhirContext.getResourceType(theResource);
 
-		return "Person".equals(resourceType) && isEmpiManaged(theResource);
+		return "Person".equals(resourceType) && isMdmManaged(theResource);
 	}
 }
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/MessageHelper.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java
similarity index 81%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/MessageHelper.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java
index 041fb32a13d..d7cb1288a60 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/MessageHelper.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiConstants;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.api.IEmpiSettings;
+import ca.uhn.fhir.mdm.api.MdmConstants;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.rest.server.provider.ProviderConstants;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,12 +13,12 @@ import org.springframework.stereotype.Service;
 public class MessageHelper {
 
 	@Autowired
-	private final IEmpiSettings myEmpiSettings;
+	private final IMdmSettings myEmpiSettings;
 
 	@Autowired
 	private final FhirContext myFhirContext;
 
-	public MessageHelper(IEmpiSettings theEmpiSettings, FhirContext theFhirContext) {
+	public MessageHelper(IMdmSettings theEmpiSettings, FhirContext theFhirContext) {
 		myEmpiSettings = theEmpiSettings;
 		myFhirContext = theFhirContext;
 	}
@@ -26,7 +26,7 @@ public class MessageHelper {
 	public String getMessageForUnmanagedResource() {
 		return String.format(
 			"Only MDM managed resources can be merged. MDM managed resources must have the %s tag.",
-			EmpiConstants.CODE_HAPI_MDM_MANAGED);
+			MdmConstants.CODE_HAPI_MDM_MANAGED);
 	}
 
 	public String getMessageForUnsupportedResource(String theName, IAnyResource theResource) {
@@ -39,7 +39,7 @@ public class MessageHelper {
 	}
 
 	public String getMessageForUnsupportedMatchResult() {
-		return "Match Result may only be set to " + EmpiMatchResultEnum.NO_MATCH + " or " + EmpiMatchResultEnum.MATCH;
+		return "Match Result may only be set to " + MdmMatchResultEnum.NO_MATCH + " or " + MdmMatchResultEnum.MATCH;
 	}
 
 	public String getMessageForUnsupportedFirstArgumentTypeInUpdate(String goldenRecordType) {
@@ -58,7 +58,7 @@ public class MessageHelper {
 	}
 
 	public String getMessageForUnsupportedTarget() {
-		return "The target is marked with the " + EmpiConstants.CODE_NO_EMPI_MANAGED
+		return "The target is marked with the " + MdmConstants.CODE_NO_MDM_MANAGED
 			+ " tag which means it may not be EMPI linked.";
 	}
 
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/NameUtil.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java
similarity index 98%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/NameUtil.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java
index 5a340ff471c..21bdf050130 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/NameUtil.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 /*-
  * #%L
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PrimitiveTypeComparingPredicate.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java
similarity index 80%
rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PrimitiveTypeComparingPredicate.java
rename to hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java
index 993d6bbeedf..53a328f2abb 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PrimitiveTypeComparingPredicate.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java
@@ -1,11 +1,5 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
-import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.util.FhirTerser;
-import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import java.lang.reflect.Field;
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMapTest.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMapTest.java
deleted file mode 100644
index c5cb95df4c8..00000000000
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/VectorMatchResultMapTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package ca.uhn.fhir.empi.rules.json;
-
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.rules.matcher.EmpiMatcherEnum;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class VectorMatchResultMapTest {
-	@Test
-	public void splitFieldMatchNames() {
-		{
-			String[] result = VectorMatchResultMap.splitFieldMatchNames("a,b");
-			assertEquals(2, result.length);
-			assertEquals("a", result[0]);
-			assertEquals("b", result[1]);
-		}
-
-		{
-			String[] result = VectorMatchResultMap.splitFieldMatchNames("a,  b");
-			assertEquals(2, result.length);
-			assertEquals("a", result[0]);
-			assertEquals("b", result[1]);
-		}
-	}
-
-	@Test
-	public void testMatchBeforePossibleMatch() {
-		EmpiRulesJson empiRulesJson = new EmpiRulesJson();
-		EmpiMatcherJson matcherJson = new EmpiMatcherJson().setAlgorithm(EmpiMatcherEnum.STRING);
-		empiRulesJson.addMatchField(new EmpiFieldMatchJson().setName("given").setResourceType("Patient").setResourcePath("name.given").setMatcher(matcherJson));
-		empiRulesJson.addMatchField(new EmpiFieldMatchJson().setName("family").setResourceType("Patient").setResourcePath("name.family").setMatcher(matcherJson));
-		empiRulesJson.addMatchField(new EmpiFieldMatchJson().setName("prefix").setResourceType("Patient").setResourcePath("name.prefix").setMatcher(matcherJson));
-		empiRulesJson.putMatchResult("given,family", EmpiMatchResultEnum.MATCH);
-		empiRulesJson.putMatchResult("given", EmpiMatchResultEnum.POSSIBLE_MATCH);
-
-		VectorMatchResultMap map = new VectorMatchResultMap(empiRulesJson);
-		assertEquals(EmpiMatchResultEnum.POSSIBLE_MATCH, map.get(1L));
-		assertEquals(EmpiMatchResultEnum.MATCH, map.get(3L));
-		assertEquals(EmpiMatchResultEnum.MATCH, map.get(7L));
-	}
-}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringMatcherR4Test.java
deleted file mode 100644
index 64449c9cc76..00000000000
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringMatcherR4Test.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package ca.uhn.fhir.empi.rules.matcher;
-
-import org.hl7.fhir.r4.model.BooleanType;
-import org.hl7.fhir.r4.model.DateType;
-import org.hl7.fhir.r4.model.Enumeration;
-import org.hl7.fhir.r4.model.Enumerations;
-import org.hl7.fhir.r4.model.StringType;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class StringMatcherR4Test extends BaseMatcherR4Test {
-	private static final Logger ourLog = LoggerFactory.getLogger(StringMatcherR4Test.class);
-	public static final String LEFT = "namadega";
-	public static final String RIGHT = "namaedga";
-
-	@Test
-	public void testNamadega() {
-		assertTrue(match(EmpiMatcherEnum.COLOGNE, LEFT, RIGHT));
-		assertTrue(match(EmpiMatcherEnum.DOUBLE_METAPHONE, LEFT, RIGHT));
-		assertTrue(match(EmpiMatcherEnum.MATCH_RATING_APPROACH, LEFT, RIGHT));
-		assertTrue(match(EmpiMatcherEnum.METAPHONE, LEFT, RIGHT));
-		assertTrue(match(EmpiMatcherEnum.SOUNDEX, LEFT, RIGHT));
-		assertTrue(match(EmpiMatcherEnum.METAPHONE, LEFT, RIGHT));
-
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE1, LEFT, RIGHT));
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE2, LEFT, RIGHT));
-		assertFalse(match(EmpiMatcherEnum.NYSIIS, LEFT, RIGHT));
-		assertFalse(match(EmpiMatcherEnum.REFINED_SOUNDEX, LEFT, RIGHT));
-		assertFalse(match(EmpiMatcherEnum.STRING, LEFT, RIGHT));
-		assertFalse(match(EmpiMatcherEnum.SUBSTRING, LEFT, RIGHT));
-	}
-
-	@Test
-	public void testMetaphone() {
-		assertTrue(match(EmpiMatcherEnum.METAPHONE, "Durie", "dury"));
-		assertTrue(match(EmpiMatcherEnum.METAPHONE, "Balo", "ballo"));
-		assertTrue(match(EmpiMatcherEnum.METAPHONE, "Hans Peter", "Hanspeter"));
-		assertTrue(match(EmpiMatcherEnum.METAPHONE, "Lawson", "Law son"));
-
-		assertFalse(match(EmpiMatcherEnum.METAPHONE, "Allsop", "Allsob"));
-		assertFalse(match(EmpiMatcherEnum.METAPHONE, "Gevne", "Geve"));
-		assertFalse(match(EmpiMatcherEnum.METAPHONE, "Bruce", "Bruch"));
-		assertFalse(match(EmpiMatcherEnum.METAPHONE, "Smith", "Schmidt"));
-		assertFalse(match(EmpiMatcherEnum.METAPHONE, "Jyothi", "Jyoti"));
-	}
-
-	@Test
-	public void testDoubleMetaphone() {
-		assertTrue(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Durie", "dury"));
-		assertTrue(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Balo", "ballo"));
-		assertTrue(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Hans Peter", "Hanspeter"));
-		assertTrue(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Lawson", "Law son"));
-		assertTrue(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Allsop", "Allsob"));
-
-		assertFalse(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Gevne", "Geve"));
-		assertFalse(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Bruce", "Bruch"));
-		assertFalse(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Smith", "Schmidt"));
-		assertFalse(match(EmpiMatcherEnum.DOUBLE_METAPHONE, "Jyothi", "Jyoti"));
-	}
-
-	@Test
-	public void testNormalizeCase() {
-		assertTrue(match(EmpiMatcherEnum.STRING, "joe", "JoE"));
-		assertTrue(match(EmpiMatcherEnum.STRING, "MCTAVISH", "McTavish"));
-
-		assertFalse(match(EmpiMatcherEnum.STRING, "joey", "joe"));
-		assertFalse(match(EmpiMatcherEnum.STRING, "joe", "joey"));
-	}
-
-	@Test
-	public void testExactString() {
-		assertTrue(EmpiMatcherEnum.STRING.match(ourFhirContext, new StringType("Jilly"), new StringType("Jilly"), true, null));
-
-		assertFalse(EmpiMatcherEnum.STRING.match(ourFhirContext, new StringType("MCTAVISH"), new StringType("McTavish"), true, null));
-		assertFalse(EmpiMatcherEnum.STRING.match(ourFhirContext, new StringType("Durie"), new StringType("dury"), true, null));
-	}
-
-	@Test
-	public void testExactBoolean() {
-		assertTrue(EmpiMatcherEnum.STRING.match(ourFhirContext, new BooleanType(true), new BooleanType(true), true, null));
-
-		assertFalse(EmpiMatcherEnum.STRING.match(ourFhirContext, new BooleanType(true), new BooleanType(false), true, null));
-		assertFalse(EmpiMatcherEnum.STRING.match(ourFhirContext, new BooleanType(false), new BooleanType(true), true, null));
-	}
-
-	@Test
-	public void testExactDateString() {
-		assertTrue(EmpiMatcherEnum.STRING.match(ourFhirContext, new DateType("1965-08-09"), new DateType("1965-08-09"), true, null));
-
-		assertFalse(EmpiMatcherEnum.STRING.match(ourFhirContext, new DateType("1965-08-09"), new DateType("1965-09-08"), true, null));
-	}
-
-
-	@Test
-	public void testExactGender() {
-		Enumeration<Enumerations.AdministrativeGender> male = new Enumeration<Enumerations.AdministrativeGender>(new Enumerations.AdministrativeGenderEnumFactory());
-		male.setValue(Enumerations.AdministrativeGender.MALE);
-
-		Enumeration<Enumerations.AdministrativeGender> female = new Enumeration<Enumerations.AdministrativeGender>(new Enumerations.AdministrativeGenderEnumFactory());
-		female.setValue(Enumerations.AdministrativeGender.FEMALE);
-
-		assertTrue(EmpiMatcherEnum.STRING.match(ourFhirContext, male, male, true, null));
-
-		assertFalse(EmpiMatcherEnum.STRING.match(ourFhirContext, male, female, true, null));
-	}
-
-	@Test
-	public void testSoundex() {
-		assertTrue(match(EmpiMatcherEnum.SOUNDEX, "Gail", "Gale"));
-		assertTrue(match(EmpiMatcherEnum.SOUNDEX, "John", "Jon"));
-		assertTrue(match(EmpiMatcherEnum.SOUNDEX, "Thom", "Tom"));
-
-		assertFalse(match(EmpiMatcherEnum.SOUNDEX, "Fred", "Frank"));
-		assertFalse(match(EmpiMatcherEnum.SOUNDEX, "Thomas", "Tom"));
-	}
-
-
-	@Test
-	public void testCaverphone1() {
-		assertTrue(match(EmpiMatcherEnum.CAVERPHONE1, "Gail", "Gael"));
-		assertTrue(match(EmpiMatcherEnum.CAVERPHONE1, "John", "Jon"));
-
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE1, "Gail", "Gale"));
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE1, "Fred", "Frank"));
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE1, "Thomas", "Tom"));
-	}
-
-	@Test
-	public void testCaverphone2() {
-		assertTrue(match(EmpiMatcherEnum.CAVERPHONE2, "Gail", "Gael"));
-		assertTrue(match(EmpiMatcherEnum.CAVERPHONE2, "John", "Jon"));
-		assertTrue(match(EmpiMatcherEnum.CAVERPHONE2, "Gail", "Gale"));
-
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE2, "Fred", "Frank"));
-		assertFalse(match(EmpiMatcherEnum.CAVERPHONE2, "Thomas", "Tom"));
-	}
-
-	@Test
-	public void testNormalizeSubstring() {
-		assertTrue(match(EmpiMatcherEnum.SUBSTRING, "BILLY", "Bill"));
-		assertTrue(match(EmpiMatcherEnum.SUBSTRING, "Bill", "Billy"));
-		assertTrue(match(EmpiMatcherEnum.SUBSTRING, "FRED", "Frederik"));
-
-		assertFalse(match(EmpiMatcherEnum.SUBSTRING, "Fred", "Friederik"));
-	}
-
-	private boolean match(EmpiMatcherEnum theMatcher, String theLeft, String theRight) {
-		return theMatcher.match(ourFhirContext, new StringType(theLeft), new StringType(theRight), false, null);
-	}
-}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
deleted file mode 100644
index 10b8254d31b..00000000000
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package ca.uhn.fhir.empi.rules.svc;
-
-import ca.uhn.fhir.empi.BaseR4Test;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiFilterSearchParamJson;
-import ca.uhn.fhir.empi.rules.json.EmpiResourceSearchParamJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.rules.json.EmpiSimilarityJson;
-import ca.uhn.fhir.empi.rules.similarity.EmpiSimilarityEnum;
-import org.hl7.fhir.r4.model.Patient;
-import org.junit.jupiter.api.BeforeEach;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public abstract class BaseEmpiRulesR4Test extends BaseR4Test {
-	public static final String PATIENT_GIVEN = "patient-given";
-	public static final String PATIENT_FAMILY = "patient-last";
-
-	public static final double NAME_THRESHOLD = 0.8;
-	protected EmpiFieldMatchJson myGivenNameMatchField;
-	protected String myBothNameFields;
-	protected EmpiRulesJson myEmpiRulesJson;
-
-	@BeforeEach
-	public void before() {
-		myEmpiRulesJson = new EmpiRulesJson();
-
-		ArrayList<String> myLegalMdmTypes = new ArrayList<>();
-		myLegalMdmTypes.add("Patient");
-		myEmpiRulesJson.setMdmTypes(myLegalMdmTypes);
-
-		myGivenNameMatchField = new EmpiFieldMatchJson()
-			.setName(PATIENT_GIVEN)
-			.setResourceType("Patient")
-			.setResourcePath("name.given")
-			.setSimilarity(new EmpiSimilarityJson().setAlgorithm(EmpiSimilarityEnum.COSINE).setMatchThreshold(NAME_THRESHOLD));
-		myBothNameFields = String.join(",", PATIENT_GIVEN, PATIENT_FAMILY);
-	}
-
-	protected EmpiRulesJson buildActiveBirthdateIdRules() {
-		EmpiFilterSearchParamJson activePatientsBlockingFilter = new EmpiFilterSearchParamJson()
-			.setResourceType("Patient")
-			.setSearchParam(Patient.SP_ACTIVE)
-			.setFixedValue("true");
-
-		EmpiResourceSearchParamJson patientBirthdayBlocking = new EmpiResourceSearchParamJson()
-			.setResourceType("Patient")
-			.addSearchParam(Patient.SP_BIRTHDATE);
-		EmpiResourceSearchParamJson patientIdentifierBlocking = new EmpiResourceSearchParamJson()
-			.setResourceType("Patient")
-			.addSearchParam(Patient.SP_IDENTIFIER);
-
-
-		EmpiFieldMatchJson lastNameMatchField = new EmpiFieldMatchJson()
-			.setName(PATIENT_FAMILY)
-			.setResourceType("Patient")
-			.setResourcePath("name.family")
-			.setSimilarity(new EmpiSimilarityJson().setAlgorithm(EmpiSimilarityEnum.JARO_WINKLER).setMatchThreshold(NAME_THRESHOLD));
-
-		EmpiRulesJson retval = new EmpiRulesJson();
-		retval.setVersion("test version");
-		retval.addResourceSearchParam(patientBirthdayBlocking);
-		retval.addResourceSearchParam(patientIdentifierBlocking);
-		retval.addFilterSearchParam(activePatientsBlockingFilter);
-		retval.addMatchField(myGivenNameMatchField);
-		retval.addMatchField(lastNameMatchField);
-		retval.setMdmTypes(Arrays.asList("Patient", "Practitioner", "Medication"));
-		retval.putMatchResult(myBothNameFields, EmpiMatchResultEnum.MATCH);
-		retval.putMatchResult(PATIENT_GIVEN, EmpiMatchResultEnum.POSSIBLE_MATCH);
-		return retval;
-	}
-}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/CustomResourceMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/CustomResourceMatcherR4Test.java
deleted file mode 100644
index 51e62840e52..00000000000
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/CustomResourceMatcherR4Test.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package ca.uhn.fhir.empi.rules.svc;
-
-import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.empi.BaseR4Test;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiMatcherJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.rules.matcher.EmpiMatcherEnum;
-import org.hl7.fhir.r4.model.HumanName;
-import org.hl7.fhir.r4.model.Patient;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class CustomResourceMatcherR4Test extends BaseR4Test {
-
-	public static final String FIELD_EXACT_MATCH_NAME = EmpiMatcherEnum.NAME_ANY_ORDER.name();
-	private static Patient ourJohnHenry;
-	private static Patient ourJohnHENRY;
-	private static Patient ourJaneHenry;
-	private static Patient ourJohnSmith;
-	private static Patient ourJohnBillyHenry;
-	private static Patient ourBillyJohnHenry;
-	private static Patient ourHenryJohn;
-	private static Patient ourHenryJOHN;
-
-	@BeforeEach
-	public void before() {
-		when(mySearchParamRetriever.getActiveSearchParam("Patient", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
-		when(mySearchParamRetriever.getActiveSearchParam("Practitioner", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
-		when(mySearchParamRetriever.getActiveSearchParam("Medication", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
-		when(mySearchParamRetriever.getActiveSearchParam("AllergyIntolerance", "identifier")).thenReturn(null);
-	}
-
-	@Test
-	public void testExactNameAnyOrder() {
-		EmpiResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(EmpiMatcherEnum.NAME_ANY_ORDER, true));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
-	}
-
-	@Test
-	public void testNormalizedNameAnyOrder() {
-		EmpiResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(EmpiMatcherEnum.NAME_ANY_ORDER, false));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
-	}
-
-	@Test
-	public void testExactNameFirstAndLast() {
-		EmpiResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(EmpiMatcherEnum.NAME_FIRST_AND_LAST, true));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
-		assertMatchResult(EmpiMatchResultEnum.MATCH, 1L, 1.0, false, false, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
-	}
-
-	@Test
-	public void testNormalizedNameFirstAndLast() {
-		EmpiResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(EmpiMatcherEnum.NAME_FIRST_AND_LAST, false));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
-		assertMatch(EmpiMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
-		assertMatch(EmpiMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
-	}
-
-	private EmpiRulesJson buildNameRules(EmpiMatcherEnum theAlgorithm, boolean theExact) {
-		EmpiMatcherJson matcherJson = new EmpiMatcherJson().setAlgorithm(theAlgorithm).setExact(theExact);
-		EmpiFieldMatchJson nameAnyOrderFieldMatch = new EmpiFieldMatchJson()
-			.setName(FIELD_EXACT_MATCH_NAME)
-			.setResourceType("Patient")
-			.setResourcePath("name")
-			.setMatcher(matcherJson);
-
-		EmpiRulesJson retval = new EmpiRulesJson();
-		retval.addMatchField(nameAnyOrderFieldMatch);
-		retval.setMdmTypes(Arrays.asList("Patient", "Practitioner", "Medication"));
-		retval.putMatchResult(FIELD_EXACT_MATCH_NAME, EmpiMatchResultEnum.MATCH);
-
-		return retval;
-	}
-
-	@BeforeAll
-	public static void beforeClass() {
-		ourJohnHenry = buildPatientWithNames("Henry", "John");
-		ourJohnHENRY = buildPatientWithNames("HENRY", "John");
-		ourJaneHenry = buildPatientWithNames("Henry", "Jane");
-		ourJohnSmith = buildPatientWithNames("Smith", "John");
-		ourJohnBillyHenry = buildPatientWithNames("Henry", "John", "Billy");
-		ourBillyJohnHenry = buildPatientWithNames("Henry", "Billy", "John");
-		ourHenryJohn = buildPatientWithNames("John", "Henry");
-		ourHenryJOHN = buildPatientWithNames("JOHN", "Henry");
-	}
-
-	protected static Patient buildPatientWithNames(String theFamilyName, String... theGivenNames) {
-		Patient patient = new Patient();
-		HumanName name = patient.addName();
-		name.setFamily(theFamilyName);
-		for (String givenName : theGivenNames) {
-			name.addGiven(givenName);
-		}
-		patient.setId("Patient/1");
-		return patient;
-	}
-}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/BaseR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java
similarity index 56%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/BaseR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java
index 092225abfe2..a76d8429e06 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/BaseR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java
@@ -1,12 +1,12 @@
-package ca.uhn.fhir.empi;
+package ca.uhn.fhir.mdm;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.rules.svc.EmpiResourceMatcherSvc;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.mdm.rules.config.MdmSettings;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
 import ca.uhn.fhir.rest.server.util.ISearchParamRetriever;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,21 +34,21 @@ public abstract class BaseR4Test {
 		return patient;
 	}
 
-	protected EmpiResourceMatcherSvc buildMatcher(EmpiRulesJson theEmpiRulesJson) {
-		EmpiResourceMatcherSvc retval = new EmpiResourceMatcherSvc(ourFhirContext, new EmpiSettings(new EmpiRuleValidator(ourFhirContext, mySearchParamRetriever)).setEmpiRules(theEmpiRulesJson));
+	protected MdmResourceMatcherSvc buildMatcher(MdmRulesJson theMdmRulesJson) {
+		MdmResourceMatcherSvc retval = new MdmResourceMatcherSvc(ourFhirContext, new MdmSettings(new MdmRuleValidator(ourFhirContext, mySearchParamRetriever)).setMdmRules(theMdmRulesJson));
 		retval.init();
 		return retval;
 	}
 
-	protected void assertMatch(EmpiMatchResultEnum theExpectedMatchEnum, EmpiMatchOutcome theMatchResult) {
+	protected void assertMatch(MdmMatchResultEnum theExpectedMatchEnum, MdmMatchOutcome theMatchResult) {
 		assertEquals(theExpectedMatchEnum, theMatchResult.getMatchResultEnum());
 	}
 
-	protected void assertMatchResult(EmpiMatchResultEnum theExpectedMatchEnum, long theExpectedVector, double theExpectedScore, boolean theExpectedNewPerson, boolean theExpectedEidMatch, EmpiMatchOutcome theMatchResult) {
+	protected void assertMatchResult(MdmMatchResultEnum theExpectedMatchEnum, long theExpectedVector, double theExpectedScore, boolean theExpectedNewPerson, boolean theExpectedEidMatch, MdmMatchOutcome theMatchResult) {
 		assertEquals(theExpectedScore, theMatchResult.score, 0.001);
 		assertEquals(theExpectedVector, theMatchResult.vector);
 		assertEquals(theExpectedEidMatch, theMatchResult.isEidMatch());
-		assertEquals(theExpectedNewPerson, theMatchResult.isNewPerson());
+		assertEquals(theExpectedNewPerson, theMatchResult.isCreatedNewResource());
 		assertEquals(theExpectedMatchEnum, theMatchResult.getMatchResultEnum());
 	}
 }
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/api/EmpiMatchOutcomeTest.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java
similarity index 56%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/api/EmpiMatchOutcomeTest.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java
index f8c5c34865a..32a6feee981 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/api/EmpiMatchOutcomeTest.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java
@@ -1,24 +1,24 @@
-package ca.uhn.fhir.empi.api;
+package ca.uhn.fhir.mdm.api;
 
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class EmpiMatchOutcomeTest {
+class MdmMatchOutcomeTest {
 
 	public static final double DELTA = 0.0001;
 
 	@Test
 	void testNormalizedScore() {
-		EmpiMatchOutcome outcome = new EmpiMatchOutcome(0l, 0.0);
+		MdmMatchOutcome outcome = new MdmMatchOutcome(0l, 0.0);
 		assertEquals(0.0, outcome.getNormalizedScore());
 
-		outcome = new EmpiMatchOutcome(null, 10.0);
-		outcome.setEmpiRuleCount(10);
+		outcome = new MdmMatchOutcome(null, 10.0);
+		outcome.setMdmRuleCount(10);
 		assertEquals(1.0, outcome.getNormalizedScore(), DELTA);
 
-		outcome = new EmpiMatchOutcome(null, 2.0);
-		outcome.setEmpiRuleCount(3);
+		outcome = new MdmMatchOutcome(null, 2.0);
+		outcome.setMdmRuleCount(3);
 		assertEquals(2.0 / 3.0, outcome.getNormalizedScore(), DELTA);
 	}
 
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/config/EmpiRuleValidatorTest.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java
similarity index 91%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/config/EmpiRuleValidatorTest.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java
index 786fa2d5939..a883af42be9 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/config/EmpiRuleValidatorTest.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.empi.rules.config;
+package ca.uhn.fhir.mdm.rules.config;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.empi.BaseR4Test;
+import ca.uhn.fhir.mdm.BaseR4Test;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.BeforeEach;
@@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class EmpiRuleValidatorTest extends BaseR4Test {
+public class MdmRuleValidatorTest extends BaseR4Test {
 
 	@BeforeEach
 	public void before() {
@@ -111,12 +111,12 @@ public class EmpiRuleValidatorTest extends BaseR4Test {
 
 
 	private void setEmpiRuleJson(String theTheS) throws IOException {
-		EmpiRuleValidator empiRuleValidator = new EmpiRuleValidator(ourFhirContext, mySearchParamRetriever);
-		EmpiSettings empiSettings = new EmpiSettings(empiRuleValidator);
+		MdmRuleValidator mdmRuleValidator = new MdmRuleValidator(ourFhirContext, mySearchParamRetriever);
+		MdmSettings mdmSettings = new MdmSettings(mdmRuleValidator);
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
 		Resource resource = resourceLoader.getResource(theTheS);
 		String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
-		empiSettings.setScriptText(json);
+		mdmSettings.setScriptText(json);
 	}
 
 }
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/EmpiRulesJsonR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java
similarity index 70%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/EmpiRulesJsonR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java
index a977d9ccb0d..90677c5c2a8 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/json/EmpiRulesJsonR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java
@@ -1,9 +1,9 @@
-package ca.uhn.fhir.empi.rules.json;
+package ca.uhn.fhir.mdm.rules.json;
 
 import ca.uhn.fhir.context.ConfigurationException;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.rules.similarity.EmpiSimilarityEnum;
-import ca.uhn.fhir.empi.rules.svc.BaseEmpiRulesR4Test;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.rules.similarity.MdmSimilarityEnum;
+import ca.uhn.fhir.mdm.rules.svc.BaseMdmRulesR4Test;
 import ca.uhn.fhir.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -17,9 +17,9 @@ import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiRulesJsonR4Test extends BaseEmpiRulesR4Test {
-	private static final Logger ourLog = LoggerFactory.getLogger(EmpiRulesJsonR4Test.class);
-	private EmpiRulesJson myRules;
+public class MdmRulesJsonR4Test extends BaseMdmRulesR4Test {
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmRulesJsonR4Test.class);
+	private MdmRulesJson myRules;
 
 	@Override
 	@BeforeEach
@@ -31,7 +31,7 @@ public class EmpiRulesJsonR4Test extends BaseEmpiRulesR4Test {
 
 	@Test
 	public void testValidate() throws IOException {
-		EmpiRulesJson rules = new EmpiRulesJson();
+		MdmRulesJson rules = new MdmRulesJson();
 		try {
 			JsonUtil.serialize(rules);
 		} catch (NullPointerException e) {
@@ -43,17 +43,17 @@ public class EmpiRulesJsonR4Test extends BaseEmpiRulesR4Test {
 	public void testSerDeser() throws IOException {
 		String json = JsonUtil.serialize(myRules);
 		ourLog.info(json);
-		EmpiRulesJson rulesDeser = JsonUtil.deserialize(json, EmpiRulesJson.class);
+		MdmRulesJson rulesDeser = JsonUtil.deserialize(json, MdmRulesJson.class);
 		assertEquals(2, rulesDeser.size());
-		assertEquals(EmpiMatchResultEnum.MATCH, rulesDeser.getMatchResult(myBothNameFields));
-		EmpiFieldMatchJson second = rulesDeser.get(1);
+		assertEquals(MdmMatchResultEnum.MATCH, rulesDeser.getMatchResult(myBothNameFields));
+		MdmFieldMatchJson second = rulesDeser.get(1);
 		assertEquals("name.family", second.getResourcePath());
-		assertEquals(EmpiSimilarityEnum.JARO_WINKLER, second.getSimilarity().getAlgorithm());
+		assertEquals(MdmSimilarityEnum.JARO_WINKLER, second.getSimilarity().getAlgorithm());
 	}
 
 	@Test
 	public void testMatchResultMap() {
-		assertEquals(EmpiMatchResultEnum.MATCH, myRules.getMatchResult(3L));
+		assertEquals(MdmMatchResultEnum.MATCH, myRules.getMatchResult(3L));
 	}
 
 	@Test
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java
new file mode 100644
index 00000000000..e129cf2f835
--- /dev/null
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java
@@ -0,0 +1,42 @@
+package ca.uhn.fhir.mdm.rules.json;
+
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherEnum;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class VectorMatchResultMapTest {
+	@Test
+	public void splitFieldMatchNames() {
+		{
+			String[] result = VectorMatchResultMap.splitFieldMatchNames("a,b");
+			assertEquals(2, result.length);
+			assertEquals("a", result[0]);
+			assertEquals("b", result[1]);
+		}
+
+		{
+			String[] result = VectorMatchResultMap.splitFieldMatchNames("a,  b");
+			assertEquals(2, result.length);
+			assertEquals("a", result[0]);
+			assertEquals("b", result[1]);
+		}
+	}
+
+	@Test
+	public void testMatchBeforePossibleMatch() {
+		MdmRulesJson mdmRulesJson = new MdmRulesJson();
+		MdmMatcherJson matcherJson = new MdmMatcherJson().setAlgorithm(MdmMatcherEnum.STRING);
+		mdmRulesJson.addMatchField(new MdmFieldMatchJson().setName("given").setResourceType("Patient").setResourcePath("name.given").setMatcher(matcherJson));
+		mdmRulesJson.addMatchField(new MdmFieldMatchJson().setName("family").setResourceType("Patient").setResourcePath("name.family").setMatcher(matcherJson));
+		mdmRulesJson.addMatchField(new MdmFieldMatchJson().setName("prefix").setResourceType("Patient").setResourcePath("name.prefix").setMatcher(matcherJson));
+		mdmRulesJson.putMatchResult("given,family", MdmMatchResultEnum.MATCH);
+		mdmRulesJson.putMatchResult("given", MdmMatchResultEnum.POSSIBLE_MATCH);
+
+		VectorMatchResultMap map = new VectorMatchResultMap(mdmRulesJson);
+		assertEquals(MdmMatchResultEnum.POSSIBLE_MATCH, map.get(1L));
+		assertEquals(MdmMatchResultEnum.MATCH, map.get(3L));
+		assertEquals(MdmMatchResultEnum.MATCH, map.get(7L));
+	}
+}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/BaseMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java
similarity index 80%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/BaseMatcherR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java
index baabaedbb4c..f6243442212 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/BaseMatcherR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 import ca.uhn.fhir.context.FhirContext;
 
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/DateMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java
similarity index 92%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/DateMatcherR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java
index 7ec3f201f9f..b427777a96d 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/DateMatcherR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
 import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import org.hl7.fhir.r4.model.DateTimeType;
@@ -43,7 +43,7 @@ public class DateMatcherR4Test extends BaseMatcherR4Test {
 	}
 
 	private boolean dateMatch(Date theDate, Date theSameMonth, TemporalPrecisionEnum theTheDay) {
-		return EmpiMatcherEnum.DATE.match(ourFhirContext, new DateType(theDate, theTheDay), new DateType(theSameMonth, theTheDay), true, null);
+		return MdmMatcherEnum.DATE.match(ourFhirContext, new DateType(theDate, theTheDay), new DateType(theSameMonth, theTheDay), true, null);
 	}
 
 	@Test
@@ -83,6 +83,6 @@ public class DateMatcherR4Test extends BaseMatcherR4Test {
 	}
 
 	private boolean dateTimeMatch(Date theDate, Date theSameSecond, TemporalPrecisionEnum theTheDay, TemporalPrecisionEnum theTheDay2) {
-		return EmpiMatcherEnum.DATE.match(ourFhirContext, new DateTimeType(theDate, theTheDay), new DateTimeType(theSameSecond, theTheDay2), true, null);
+		return MdmMatcherEnum.DATE.match(ourFhirContext, new DateTimeType(theDate, theTheDay), new DateTimeType(theSameSecond, theTheDay2), true, null);
 	}
 }
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/IdentifierMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java
similarity index 73%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/IdentifierMatcherR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java
index 29930bf60bb..5e6758af0a0 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/IdentifierMatcherR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiMatcherJson;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmMatcherJson;
 import org.hl7.fhir.r4.model.Identifier;
 import org.junit.jupiter.api.Test;
 
@@ -19,8 +19,8 @@ public class IdentifierMatcherR4Test extends BaseMatcherR4Test {
 		Identifier left = new Identifier().setSystem(MATCHING_SYSTEM).setValue(MATCHING_VALUE);
 		Identifier right = new Identifier().setSystem(MATCHING_SYSTEM).setValue(MATCHING_VALUE);
 
-		EmpiMatcherJson matcher = new EmpiMatcherJson().setAlgorithm(EmpiMatcherEnum.IDENTIFIER);
-		EmpiFieldMatchJson fieldMatch = new EmpiFieldMatchJson().setMatcher(matcher);
+		MdmMatcherJson matcher = new MdmMatcherJson().setAlgorithm(MdmMatcherEnum.IDENTIFIER);
+		MdmFieldMatchJson fieldMatch = new MdmFieldMatchJson().setMatcher(matcher);
 
 		assertTrue(fieldMatch.match(ourFhirContext, left, right).match);
 	}
@@ -33,8 +33,8 @@ public class IdentifierMatcherR4Test extends BaseMatcherR4Test {
 		Identifier rightNoSystem = new Identifier().setValue(MATCHING_VALUE);
 		Identifier rightNoValue = new Identifier().setSystem(MATCHING_SYSTEM);
 
-		EmpiMatcherJson matcher = new EmpiMatcherJson().setAlgorithm(EmpiMatcherEnum.IDENTIFIER);
-		EmpiFieldMatchJson fieldMatch = new EmpiFieldMatchJson().setMatcher(matcher);
+		MdmMatcherJson matcher = new MdmMatcherJson().setAlgorithm(MdmMatcherEnum.IDENTIFIER);
+		MdmFieldMatchJson fieldMatch = new MdmFieldMatchJson().setMatcher(matcher);
 
 		assertFalse(fieldMatch.match(ourFhirContext, left, rightWrongSystem).match);
 		assertFalse(fieldMatch.match(ourFhirContext, left, rightWrongValue).match);
@@ -51,8 +51,8 @@ public class IdentifierMatcherR4Test extends BaseMatcherR4Test {
 		Identifier left = new Identifier().setSystem(MATCHING_SYSTEM).setValue(MATCHING_VALUE);
 		Identifier right = new Identifier().setSystem(MATCHING_SYSTEM).setValue(MATCHING_VALUE);
 
-		EmpiMatcherJson matcher = new EmpiMatcherJson().setAlgorithm(EmpiMatcherEnum.IDENTIFIER).setIdentifierSystem(MATCHING_SYSTEM);
-		EmpiFieldMatchJson fieldMatch = new EmpiFieldMatchJson().setMatcher(matcher);
+		MdmMatcherJson matcher = new MdmMatcherJson().setAlgorithm(MdmMatcherEnum.IDENTIFIER).setIdentifierSystem(MATCHING_SYSTEM);
+		MdmFieldMatchJson fieldMatch = new MdmFieldMatchJson().setMatcher(matcher);
 
 		assertTrue(fieldMatch.match(ourFhirContext, left, right).match);
 	}
@@ -62,8 +62,8 @@ public class IdentifierMatcherR4Test extends BaseMatcherR4Test {
 		Identifier left = new Identifier().setSystem(OTHER_SYSTEM).setValue(MATCHING_VALUE);
 		Identifier right = new Identifier().setSystem(OTHER_SYSTEM).setValue(MATCHING_VALUE);
 
-		EmpiMatcherJson matcher = new EmpiMatcherJson().setAlgorithm(EmpiMatcherEnum.IDENTIFIER).setIdentifierSystem(MATCHING_SYSTEM);
-		EmpiFieldMatchJson fieldMatch = new EmpiFieldMatchJson().setMatcher(matcher);
+		MdmMatcherJson matcher = new MdmMatcherJson().setAlgorithm(MdmMatcherEnum.IDENTIFIER).setIdentifierSystem(MATCHING_SYSTEM);
+		MdmFieldMatchJson fieldMatch = new MdmFieldMatchJson().setMatcher(matcher);
 
 		assertFalse(fieldMatch.match(ourFhirContext, left, right).match);
 	}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java
new file mode 100644
index 00000000000..42508046adc
--- /dev/null
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java
@@ -0,0 +1,154 @@
+package ca.uhn.fhir.mdm.rules.matcher;
+
+import org.hl7.fhir.r4.model.BooleanType;
+import org.hl7.fhir.r4.model.DateType;
+import org.hl7.fhir.r4.model.Enumeration;
+import org.hl7.fhir.r4.model.Enumerations;
+import org.hl7.fhir.r4.model.StringType;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class StringMatcherR4Test extends BaseMatcherR4Test {
+	private static final Logger ourLog = LoggerFactory.getLogger(StringMatcherR4Test.class);
+	public static final String LEFT = "namadega";
+	public static final String RIGHT = "namaedga";
+
+	@Test
+	public void testNamadega() {
+		assertTrue(match(MdmMatcherEnum.COLOGNE, LEFT, RIGHT));
+		assertTrue(match(MdmMatcherEnum.DOUBLE_METAPHONE, LEFT, RIGHT));
+		assertTrue(match(MdmMatcherEnum.MATCH_RATING_APPROACH, LEFT, RIGHT));
+		assertTrue(match(MdmMatcherEnum.METAPHONE, LEFT, RIGHT));
+		assertTrue(match(MdmMatcherEnum.SOUNDEX, LEFT, RIGHT));
+		assertTrue(match(MdmMatcherEnum.METAPHONE, LEFT, RIGHT));
+
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE1, LEFT, RIGHT));
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE2, LEFT, RIGHT));
+		assertFalse(match(MdmMatcherEnum.NYSIIS, LEFT, RIGHT));
+		assertFalse(match(MdmMatcherEnum.REFINED_SOUNDEX, LEFT, RIGHT));
+		assertFalse(match(MdmMatcherEnum.STRING, LEFT, RIGHT));
+		assertFalse(match(MdmMatcherEnum.SUBSTRING, LEFT, RIGHT));
+	}
+
+	@Test
+	public void testMetaphone() {
+		assertTrue(match(MdmMatcherEnum.METAPHONE, "Durie", "dury"));
+		assertTrue(match(MdmMatcherEnum.METAPHONE, "Balo", "ballo"));
+		assertTrue(match(MdmMatcherEnum.METAPHONE, "Hans Peter", "Hanspeter"));
+		assertTrue(match(MdmMatcherEnum.METAPHONE, "Lawson", "Law son"));
+
+		assertFalse(match(MdmMatcherEnum.METAPHONE, "Allsop", "Allsob"));
+		assertFalse(match(MdmMatcherEnum.METAPHONE, "Gevne", "Geve"));
+		assertFalse(match(MdmMatcherEnum.METAPHONE, "Bruce", "Bruch"));
+		assertFalse(match(MdmMatcherEnum.METAPHONE, "Smith", "Schmidt"));
+		assertFalse(match(MdmMatcherEnum.METAPHONE, "Jyothi", "Jyoti"));
+	}
+
+	@Test
+	public void testDoubleMetaphone() {
+		assertTrue(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Durie", "dury"));
+		assertTrue(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Balo", "ballo"));
+		assertTrue(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Hans Peter", "Hanspeter"));
+		assertTrue(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Lawson", "Law son"));
+		assertTrue(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Allsop", "Allsob"));
+
+		assertFalse(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Gevne", "Geve"));
+		assertFalse(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Bruce", "Bruch"));
+		assertFalse(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Smith", "Schmidt"));
+		assertFalse(match(MdmMatcherEnum.DOUBLE_METAPHONE, "Jyothi", "Jyoti"));
+	}
+
+	@Test
+	public void testNormalizeCase() {
+		assertTrue(match(MdmMatcherEnum.STRING, "joe", "JoE"));
+		assertTrue(match(MdmMatcherEnum.STRING, "MCTAVISH", "McTavish"));
+
+		assertFalse(match(MdmMatcherEnum.STRING, "joey", "joe"));
+		assertFalse(match(MdmMatcherEnum.STRING, "joe", "joey"));
+	}
+
+	@Test
+	public void testExactString() {
+		assertTrue(MdmMatcherEnum.STRING.match(ourFhirContext, new StringType("Jilly"), new StringType("Jilly"), true, null));
+
+		assertFalse(MdmMatcherEnum.STRING.match(ourFhirContext, new StringType("MCTAVISH"), new StringType("McTavish"), true, null));
+		assertFalse(MdmMatcherEnum.STRING.match(ourFhirContext, new StringType("Durie"), new StringType("dury"), true, null));
+	}
+
+	@Test
+	public void testExactBoolean() {
+		assertTrue(MdmMatcherEnum.STRING.match(ourFhirContext, new BooleanType(true), new BooleanType(true), true, null));
+
+		assertFalse(MdmMatcherEnum.STRING.match(ourFhirContext, new BooleanType(true), new BooleanType(false), true, null));
+		assertFalse(MdmMatcherEnum.STRING.match(ourFhirContext, new BooleanType(false), new BooleanType(true), true, null));
+	}
+
+	@Test
+	public void testExactDateString() {
+		assertTrue(MdmMatcherEnum.STRING.match(ourFhirContext, new DateType("1965-08-09"), new DateType("1965-08-09"), true, null));
+
+		assertFalse(MdmMatcherEnum.STRING.match(ourFhirContext, new DateType("1965-08-09"), new DateType("1965-09-08"), true, null));
+	}
+
+
+	@Test
+	public void testExactGender() {
+		Enumeration<Enumerations.AdministrativeGender> male = new Enumeration<Enumerations.AdministrativeGender>(new Enumerations.AdministrativeGenderEnumFactory());
+		male.setValue(Enumerations.AdministrativeGender.MALE);
+
+		Enumeration<Enumerations.AdministrativeGender> female = new Enumeration<Enumerations.AdministrativeGender>(new Enumerations.AdministrativeGenderEnumFactory());
+		female.setValue(Enumerations.AdministrativeGender.FEMALE);
+
+		assertTrue(MdmMatcherEnum.STRING.match(ourFhirContext, male, male, true, null));
+
+		assertFalse(MdmMatcherEnum.STRING.match(ourFhirContext, male, female, true, null));
+	}
+
+	@Test
+	public void testSoundex() {
+		assertTrue(match(MdmMatcherEnum.SOUNDEX, "Gail", "Gale"));
+		assertTrue(match(MdmMatcherEnum.SOUNDEX, "John", "Jon"));
+		assertTrue(match(MdmMatcherEnum.SOUNDEX, "Thom", "Tom"));
+
+		assertFalse(match(MdmMatcherEnum.SOUNDEX, "Fred", "Frank"));
+		assertFalse(match(MdmMatcherEnum.SOUNDEX, "Thomas", "Tom"));
+	}
+
+
+	@Test
+	public void testCaverphone1() {
+		assertTrue(match(MdmMatcherEnum.CAVERPHONE1, "Gail", "Gael"));
+		assertTrue(match(MdmMatcherEnum.CAVERPHONE1, "John", "Jon"));
+
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE1, "Gail", "Gale"));
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE1, "Fred", "Frank"));
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE1, "Thomas", "Tom"));
+	}
+
+	@Test
+	public void testCaverphone2() {
+		assertTrue(match(MdmMatcherEnum.CAVERPHONE2, "Gail", "Gael"));
+		assertTrue(match(MdmMatcherEnum.CAVERPHONE2, "John", "Jon"));
+		assertTrue(match(MdmMatcherEnum.CAVERPHONE2, "Gail", "Gale"));
+
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE2, "Fred", "Frank"));
+		assertFalse(match(MdmMatcherEnum.CAVERPHONE2, "Thomas", "Tom"));
+	}
+
+	@Test
+	public void testNormalizeSubstring() {
+		assertTrue(match(MdmMatcherEnum.SUBSTRING, "BILLY", "Bill"));
+		assertTrue(match(MdmMatcherEnum.SUBSTRING, "Bill", "Billy"));
+		assertTrue(match(MdmMatcherEnum.SUBSTRING, "FRED", "Frederik"));
+
+		assertFalse(match(MdmMatcherEnum.SUBSTRING, "Fred", "Friederik"));
+	}
+
+	private boolean match(MdmMatcherEnum theMatcher, String theLeft, String theRight) {
+		return theMatcher.match(ourFhirContext, new StringType(theLeft), new StringType(theRight), false, null);
+	}
+}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringSimilarityR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java
similarity index 85%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringSimilarityR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java
index fe53d399043..c806be9b99e 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/matcher/StringSimilarityR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.empi.rules.matcher;
+package ca.uhn.fhir.mdm.rules.matcher;
 
-import ca.uhn.fhir.empi.rules.similarity.HapiStringSimilarity;
-import ca.uhn.fhir.empi.rules.similarity.IEmpiFieldSimilarity;
+import ca.uhn.fhir.mdm.rules.similarity.HapiStringSimilarity;
+import ca.uhn.fhir.mdm.rules.similarity.IMdmFieldSimilarity;
 import info.debatty.java.stringsimilarity.Cosine;
 import info.debatty.java.stringsimilarity.Jaccard;
 import info.debatty.java.stringsimilarity.JaroWinkler;
@@ -32,7 +32,7 @@ public class StringSimilarityR4Test extends BaseMatcherR4Test {
 		ourLog.info("" + similarity(SORENSEN_DICE, LEFT, RIGHT));
 	}
 	
-	private double similarity(IEmpiFieldSimilarity theSimilarity, String theLeft, String theRight) {
+	private double similarity(IMdmFieldSimilarity theSimilarity, String theLeft, String theRight) {
 		return theSimilarity.similarity(ourFhirContext, new StringType(theLeft), new StringType(theRight), false);
 	}
 }
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java
new file mode 100644
index 00000000000..e7ab67d3b52
--- /dev/null
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java
@@ -0,0 +1,74 @@
+package ca.uhn.fhir.mdm.rules.svc;
+
+import ca.uhn.fhir.mdm.BaseR4Test;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmFilterSearchParamJson;
+import ca.uhn.fhir.mdm.rules.json.MdmResourceSearchParamJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.mdm.rules.json.MdmSimilarityJson;
+import ca.uhn.fhir.mdm.rules.similarity.MdmSimilarityEnum;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.jupiter.api.BeforeEach;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public abstract class BaseMdmRulesR4Test extends BaseR4Test {
+	public static final String PATIENT_GIVEN = "patient-given";
+	public static final String PATIENT_FAMILY = "patient-last";
+
+	public static final double NAME_THRESHOLD = 0.8;
+	protected MdmFieldMatchJson myGivenNameMatchField;
+	protected String myBothNameFields;
+	protected MdmRulesJson myMdmRulesJson;
+
+	@BeforeEach
+	public void before() {
+		myMdmRulesJson = new MdmRulesJson();
+
+		ArrayList<String> myLegalMdmTypes = new ArrayList<>();
+		myLegalMdmTypes.add("Patient");
+		myMdmRulesJson.setMdmTypes(myLegalMdmTypes);
+
+		myGivenNameMatchField = new MdmFieldMatchJson()
+			.setName(PATIENT_GIVEN)
+			.setResourceType("Patient")
+			.setResourcePath("name.given")
+			.setSimilarity(new MdmSimilarityJson().setAlgorithm(MdmSimilarityEnum.COSINE).setMatchThreshold(NAME_THRESHOLD));
+		myBothNameFields = String.join(",", PATIENT_GIVEN, PATIENT_FAMILY);
+	}
+
+	protected MdmRulesJson buildActiveBirthdateIdRules() {
+		MdmFilterSearchParamJson activePatientsBlockingFilter = new MdmFilterSearchParamJson()
+			.setResourceType("Patient")
+			.setSearchParam(Patient.SP_ACTIVE)
+			.setFixedValue("true");
+
+		MdmResourceSearchParamJson patientBirthdayBlocking = new MdmResourceSearchParamJson()
+			.setResourceType("Patient")
+			.addSearchParam(Patient.SP_BIRTHDATE);
+		MdmResourceSearchParamJson patientIdentifierBlocking = new MdmResourceSearchParamJson()
+			.setResourceType("Patient")
+			.addSearchParam(Patient.SP_IDENTIFIER);
+
+
+		MdmFieldMatchJson lastNameMatchField = new MdmFieldMatchJson()
+			.setName(PATIENT_FAMILY)
+			.setResourceType("Patient")
+			.setResourcePath("name.family")
+			.setSimilarity(new MdmSimilarityJson().setAlgorithm(MdmSimilarityEnum.JARO_WINKLER).setMatchThreshold(NAME_THRESHOLD));
+
+		MdmRulesJson retval = new MdmRulesJson();
+		retval.setVersion("test version");
+		retval.addResourceSearchParam(patientBirthdayBlocking);
+		retval.addResourceSearchParam(patientIdentifierBlocking);
+		retval.addFilterSearchParam(activePatientsBlockingFilter);
+		retval.addMatchField(myGivenNameMatchField);
+		retval.addMatchField(lastNameMatchField);
+		retval.setMdmTypes(Arrays.asList("Patient", "Practitioner", "Medication"));
+		retval.putMatchResult(myBothNameFields, MdmMatchResultEnum.MATCH);
+		retval.putMatchResult(PATIENT_GIVEN, MdmMatchResultEnum.POSSIBLE_MATCH);
+		return retval;
+	}
+}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java
new file mode 100644
index 00000000000..7232394673e
--- /dev/null
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java
@@ -0,0 +1,132 @@
+package ca.uhn.fhir.mdm.rules.svc;
+
+import ca.uhn.fhir.context.RuntimeSearchParam;
+import ca.uhn.fhir.mdm.BaseR4Test;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmMatcherJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherEnum;
+import org.hl7.fhir.r4.model.HumanName;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class CustomResourceMatcherR4Test extends BaseR4Test {
+
+	public static final String FIELD_EXACT_MATCH_NAME = MdmMatcherEnum.NAME_ANY_ORDER.name();
+	private static Patient ourJohnHenry;
+	private static Patient ourJohnHENRY;
+	private static Patient ourJaneHenry;
+	private static Patient ourJohnSmith;
+	private static Patient ourJohnBillyHenry;
+	private static Patient ourBillyJohnHenry;
+	private static Patient ourHenryJohn;
+	private static Patient ourHenryJOHN;
+
+	@BeforeEach
+	public void before() {
+		when(mySearchParamRetriever.getActiveSearchParam("Patient", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
+		when(mySearchParamRetriever.getActiveSearchParam("Practitioner", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
+		when(mySearchParamRetriever.getActiveSearchParam("Medication", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
+		when(mySearchParamRetriever.getActiveSearchParam("AllergyIntolerance", "identifier")).thenReturn(null);
+	}
+
+	@Test
+	public void testExactNameAnyOrder() {
+		MdmResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(MdmMatcherEnum.NAME_ANY_ORDER, true));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
+	}
+
+	@Test
+	public void testNormalizedNameAnyOrder() {
+		MdmResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(MdmMatcherEnum.NAME_ANY_ORDER, false));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
+	}
+
+	@Test
+	public void testExactNameFirstAndLast() {
+		MdmResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(MdmMatcherEnum.NAME_FIRST_AND_LAST, true));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
+		assertMatchResult(MdmMatchResultEnum.MATCH, 1L, 1.0, false, false, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
+	}
+
+	@Test
+	public void testNormalizedNameFirstAndLast() {
+		MdmResourceMatcherSvc nameAnyOrderMatcher = buildMatcher(buildNameRules(MdmMatcherEnum.NAME_FIRST_AND_LAST, false));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHenry));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJohn));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourHenryJOHN));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnHENRY));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJaneHenry));
+		assertMatch(MdmMatchResultEnum.NO_MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnSmith));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourJohnBillyHenry));
+		assertMatch(MdmMatchResultEnum.MATCH, nameAnyOrderMatcher.match(ourJohnHenry, ourBillyJohnHenry));
+	}
+
+	private MdmRulesJson buildNameRules(MdmMatcherEnum theAlgorithm, boolean theExact) {
+		MdmMatcherJson matcherJson = new MdmMatcherJson().setAlgorithm(theAlgorithm).setExact(theExact);
+		MdmFieldMatchJson nameAnyOrderFieldMatch = new MdmFieldMatchJson()
+			.setName(FIELD_EXACT_MATCH_NAME)
+			.setResourceType("Patient")
+			.setResourcePath("name")
+			.setMatcher(matcherJson);
+
+		MdmRulesJson retval = new MdmRulesJson();
+		retval.addMatchField(nameAnyOrderFieldMatch);
+		retval.setMdmTypes(Arrays.asList("Patient", "Practitioner", "Medication"));
+		retval.putMatchResult(FIELD_EXACT_MATCH_NAME, MdmMatchResultEnum.MATCH);
+
+		return retval;
+	}
+
+	@BeforeAll
+	public static void beforeClass() {
+		ourJohnHenry = buildPatientWithNames("Henry", "John");
+		ourJohnHENRY = buildPatientWithNames("HENRY", "John");
+		ourJaneHenry = buildPatientWithNames("Henry", "Jane");
+		ourJohnSmith = buildPatientWithNames("Smith", "John");
+		ourJohnBillyHenry = buildPatientWithNames("Henry", "John", "Billy");
+		ourBillyJohnHenry = buildPatientWithNames("Henry", "Billy", "John");
+		ourHenryJohn = buildPatientWithNames("John", "Henry");
+		ourHenryJOHN = buildPatientWithNames("JOHN", "Henry");
+	}
+
+	protected static Patient buildPatientWithNames(String theFamilyName, String... theGivenNames) {
+		Patient patient = new Patient();
+		HumanName name = patient.addName();
+		name.setFamily(theFamilyName);
+		for (String givenName : theGivenNames) {
+			name.addGiven(givenName);
+		}
+		patient.setId("Patient/1");
+		return patient;
+	}
+}
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java
similarity index 69%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java
index e41ff1e36d9..bfff9f04056 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java
@@ -1,17 +1,14 @@
-package ca.uhn.fhir.empi.rules.svc;
+package ca.uhn.fhir.mdm.rules.svc;
 
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.rules.json.EmpiSimilarityJson;
-import ca.uhn.fhir.empi.rules.similarity.EmpiSimilarityEnum;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmSimilarityJson;
+import ca.uhn.fhir.mdm.rules.similarity.MdmSimilarityEnum;
 import ca.uhn.fhir.parser.DataFormatException;
 import org.hl7.fhir.r4.model.Encounter;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringStartsWith.startsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -19,8 +16,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class EmpiResourceFieldMatcherR4Test extends BaseEmpiRulesR4Test {
-	protected EmpiResourceFieldMatcher myComparator;
+public class MdmResourceFieldMatcherR4Test extends BaseMdmRulesR4Test {
+	protected MdmResourceFieldMatcher myComparator;
 	private Patient myJohn;
 	private Patient myJohny;
 
@@ -29,7 +26,7 @@ public class EmpiResourceFieldMatcherR4Test extends BaseEmpiRulesR4Test {
 	public void before() {
 		super.before();
 
-		myComparator = new EmpiResourceFieldMatcher(ourFhirContext, myGivenNameMatchField, myEmpiRulesJson);
+		myComparator = new MdmResourceFieldMatcher(ourFhirContext, myGivenNameMatchField, myMdmRulesJson);
 		myJohn = buildJohn();
 		myJohny = buildJohny();
 	}
@@ -64,12 +61,12 @@ public class EmpiResourceFieldMatcherR4Test extends BaseEmpiRulesR4Test {
 	@Test
 	public void testBadPath() {
 		try {
-			EmpiFieldMatchJson matchField = new EmpiFieldMatchJson()
+			MdmFieldMatchJson matchField = new MdmFieldMatchJson()
 				.setName("patient-foo")
 				.setResourceType("Patient")
 				.setResourcePath("foo")
-				.setSimilarity(new EmpiSimilarityJson().setAlgorithm(EmpiSimilarityEnum.COSINE).setMatchThreshold(NAME_THRESHOLD));
-			EmpiResourceFieldMatcher comparator = new EmpiResourceFieldMatcher(ourFhirContext, matchField, myEmpiRulesJson);
+				.setSimilarity(new MdmSimilarityJson().setAlgorithm(MdmSimilarityEnum.COSINE).setMatchThreshold(NAME_THRESHOLD));
+			MdmResourceFieldMatcher comparator = new MdmResourceFieldMatcher(ourFhirContext, matchField, myMdmRulesJson);
 			comparator.match(myJohn, myJohny);
 			fail();
 		} catch (DataFormatException e) {
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java
similarity index 57%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java
index 8f409913286..912348f5980 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java
@@ -1,8 +1,8 @@
-package ca.uhn.fhir.empi.rules.svc;
+package ca.uhn.fhir.mdm.rules.svc;
 
 import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class EmpiResourceMatcherSvcR4Test extends BaseEmpiRulesR4Test {
-	private EmpiResourceMatcherSvc myEmpiResourceMatcherSvc;
+public class MdmResourceMatcherSvcR4Test extends BaseMdmRulesR4Test {
+	private MdmResourceMatcherSvc myMdmResourceMatcherSvc;
 	private Patient myJohn;
 	private Patient myJohny;
 
@@ -26,7 +26,7 @@ public class EmpiResourceMatcherSvcR4Test extends BaseEmpiRulesR4Test {
 		when(mySearchParamRetriever.getActiveSearchParam("Medication", "identifier")).thenReturn(mock(RuntimeSearchParam.class));
 		when(mySearchParamRetriever.getActiveSearchParam("Patient", "active")).thenReturn(mock(RuntimeSearchParam.class));
 
-		myEmpiResourceMatcherSvc = buildMatcher(buildActiveBirthdateIdRules());
+		myMdmResourceMatcherSvc = buildMatcher(buildActiveBirthdateIdRules());
 
 		myJohn = buildJohn();
 		myJohny = buildJohny();
@@ -34,8 +34,8 @@ public class EmpiResourceMatcherSvcR4Test extends BaseEmpiRulesR4Test {
 
 	@Test
 	public void testCompareFirstNameMatch() {
-		EmpiMatchOutcome result = myEmpiResourceMatcherSvc.match(myJohn, myJohny);
-		assertMatchResult(EmpiMatchResultEnum.POSSIBLE_MATCH, 1L, 0.816, false, false, result);
+		MdmMatchOutcome result = myMdmResourceMatcherSvc.match(myJohn, myJohny);
+		assertMatchResult(MdmMatchResultEnum.POSSIBLE_MATCH, 1L, 0.816, false, false, result);
 
 	}
 
@@ -43,19 +43,19 @@ public class EmpiResourceMatcherSvcR4Test extends BaseEmpiRulesR4Test {
 	public void testCompareBothNamesMatch() {
 		myJohn.addName().setFamily("Smith");
 		myJohny.addName().setFamily("Smith");
-		EmpiMatchOutcome result = myEmpiResourceMatcherSvc.match(myJohn, myJohny);
-		assertMatchResult(EmpiMatchResultEnum.MATCH, 3L, 1.816, false, false, result);
+		MdmMatchOutcome result = myMdmResourceMatcherSvc.match(myJohn, myJohny);
+		assertMatchResult(MdmMatchResultEnum.MATCH, 3L, 1.816, false, false, result);
 	}
 
 	@Test
 	public void testMatchResult() {
-		assertMatchResult(EmpiMatchResultEnum.POSSIBLE_MATCH, 1L, 0.816, false, false, myEmpiResourceMatcherSvc.getMatchResult(myJohn, myJohny));
+		assertMatchResult(MdmMatchResultEnum.POSSIBLE_MATCH, 1L, 0.816, false, false, myMdmResourceMatcherSvc.getMatchResult(myJohn, myJohny));
 		myJohn.addName().setFamily("Smith");
 		myJohny.addName().setFamily("Smith");
-		assertMatchResult(EmpiMatchResultEnum.MATCH, 3L, 1.816, false, false, myEmpiResourceMatcherSvc.getMatchResult(myJohn, myJohny));
+		assertMatchResult(MdmMatchResultEnum.MATCH, 3L, 1.816, false, false, myMdmResourceMatcherSvc.getMatchResult(myJohn, myJohny));
 		Patient patient3 = new Patient();
 		patient3.setId("Patient/3");
 		patient3.addName().addGiven("Henry");
-		assertMatchResult(EmpiMatchResultEnum.NO_MATCH, 0L, 0.0, false, false, myEmpiResourceMatcherSvc.getMatchResult(myJohn, patient3));
+		assertMatchResult(MdmMatchResultEnum.NO_MATCH, 0L, 0.0, false, false, myMdmResourceMatcherSvc.getMatchResult(myJohn, patient3));
 	}
 }
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/ResourceMatcherR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java
similarity index 61%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/ResourceMatcherR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java
index 0a1764adf54..7301b2bcbbd 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/ResourceMatcherR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java
@@ -1,12 +1,12 @@
-package ca.uhn.fhir.empi.rules.svc;
+package ca.uhn.fhir.mdm.rules.svc;
 
 import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
-import ca.uhn.fhir.empi.api.EmpiMatchResultEnum;
-import ca.uhn.fhir.empi.rules.json.EmpiFieldMatchJson;
-import ca.uhn.fhir.empi.rules.json.EmpiMatcherJson;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.rules.matcher.EmpiMatcherEnum;
+import ca.uhn.fhir.mdm.api.MdmMatchOutcome;
+import ca.uhn.fhir.mdm.api.MdmMatchResultEnum;
+import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
+import ca.uhn.fhir.mdm.rules.json.MdmMatcherJson;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherEnum;
 import org.hl7.fhir.r4.model.HumanName;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
@@ -17,7 +17,7 @@ import java.util.Arrays;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ResourceMatcherR4Test extends BaseEmpiRulesR4Test {
+public class ResourceMatcherR4Test extends BaseMdmRulesR4Test {
 	private static final String PATIENT_PHONE = "phone";
 	private static final String MATCH_FIELDS = PATIENT_GIVEN + "," + PATIENT_FAMILY + "," + PATIENT_PHONE;
 	public static final String PHONE_NUMBER = "123 456789";
@@ -55,44 +55,44 @@ public class ResourceMatcherR4Test extends BaseEmpiRulesR4Test {
 
 	@Test
 	public void testMetaphoneMatchResult() {
-		EmpiResourceMatcherSvc matcherSvc = buildMatcher(buildNamePhoneRules(EmpiMatcherEnum.METAPHONE));
-		EmpiMatchOutcome result = matcherSvc.match(myLeft, myRight);
-		assertMatchResult(EmpiMatchResultEnum.MATCH, 7L, 3.0, false, false, result);
+		MdmResourceMatcherSvc matcherSvc = buildMatcher(buildNamePhoneRules(MdmMatcherEnum.METAPHONE));
+		MdmMatchOutcome result = matcherSvc.match(myLeft, myRight);
+		assertMatchResult(MdmMatchResultEnum.MATCH, 7L, 3.0, false, false, result);
 	}
 
 	@Test
 	public void testStringMatchResult() {
-		EmpiResourceMatcherSvc matcherSvc = buildMatcher(buildNamePhoneRules(EmpiMatcherEnum.STRING));
-		EmpiMatchOutcome result = matcherSvc.match(myLeft, myRight);
-		assertMatchResult(EmpiMatchResultEnum.NO_MATCH, 5L, 2.0, false, false, result);
+		MdmResourceMatcherSvc matcherSvc = buildMatcher(buildNamePhoneRules(MdmMatcherEnum.STRING));
+		MdmMatchOutcome result = matcherSvc.match(myLeft, myRight);
+		assertMatchResult(MdmMatchResultEnum.NO_MATCH, 5L, 2.0, false, false, result);
 	}
 
-	protected EmpiRulesJson buildNamePhoneRules(EmpiMatcherEnum theMatcherEnum) {
-		EmpiFieldMatchJson lastNameMatchField = new EmpiFieldMatchJson()
+	protected MdmRulesJson buildNamePhoneRules(MdmMatcherEnum theMatcherEnum) {
+		MdmFieldMatchJson lastNameMatchField = new MdmFieldMatchJson()
 			.setName(PATIENT_FAMILY)
 			.setResourceType("Patient")
 			.setResourcePath("name.family")
-			.setMatcher(new EmpiMatcherJson().setAlgorithm(theMatcherEnum));
+			.setMatcher(new MdmMatcherJson().setAlgorithm(theMatcherEnum));
 
-		EmpiFieldMatchJson firstNameMatchField = new EmpiFieldMatchJson()
+		MdmFieldMatchJson firstNameMatchField = new MdmFieldMatchJson()
 			.setName(PATIENT_GIVEN)
 			.setResourceType("Patient")
 			.setResourcePath("name.given")
-			.setMatcher(new EmpiMatcherJson().setAlgorithm(theMatcherEnum));
+			.setMatcher(new MdmMatcherJson().setAlgorithm(theMatcherEnum));
 
-		EmpiFieldMatchJson phoneField = new EmpiFieldMatchJson()
+		MdmFieldMatchJson phoneField = new MdmFieldMatchJson()
 			.setName(PATIENT_PHONE)
 			.setResourceType("Patient")
 			.setResourcePath("telecom.value")
-			.setMatcher(new EmpiMatcherJson().setAlgorithm(EmpiMatcherEnum.STRING));
+			.setMatcher(new MdmMatcherJson().setAlgorithm(MdmMatcherEnum.STRING));
 
-		EmpiRulesJson retval = new EmpiRulesJson();
+		MdmRulesJson retval = new MdmRulesJson();
 		retval.setVersion("test version");
 		retval.addMatchField(firstNameMatchField);
 		retval.addMatchField(lastNameMatchField);
 		retval.setMdmTypes(Arrays.asList("Patient", "Practitioner", "Medication"));
 		retval.addMatchField(phoneField);
-		retval.putMatchResult(MATCH_FIELDS, EmpiMatchResultEnum.MATCH);
+		retval.putMatchResult(MATCH_FIELDS, MdmMatchResultEnum.MATCH);
 		return retval;
 	}
 }
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/EIDHelperR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java
similarity index 78%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/EIDHelperR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java
index 3b9e4dda949..ae93b29fe00 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/EIDHelperR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java
@@ -1,25 +1,24 @@
-package ca.uhn.fhir.empi.svc;
+package ca.uhn.fhir.mdm.svc;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.empi.BaseR4Test;
-import ca.uhn.fhir.empi.model.CanonicalEID;
-import ca.uhn.fhir.empi.rules.config.EmpiRuleValidator;
-import ca.uhn.fhir.empi.rules.config.EmpiSettings;
-import ca.uhn.fhir.empi.rules.json.EmpiRulesJson;
-import ca.uhn.fhir.empi.util.EIDHelper;
+import ca.uhn.fhir.mdm.BaseR4Test;
+import ca.uhn.fhir.mdm.model.CanonicalEID;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.mdm.rules.config.MdmSettings;
+import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
+import ca.uhn.fhir.mdm.util.EIDHelper;
 import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
-import static ca.uhn.fhir.empi.api.EmpiConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM;
+import static ca.uhn.fhir.mdm.api.MdmConstants.HAPI_ENTERPRISE_IDENTIFIER_SYSTEM;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -30,16 +29,16 @@ import static org.mockito.Mockito.when;
 public class EIDHelperR4Test extends BaseR4Test {
 
 	private static final FhirContext ourFhirContext = FhirContext.forR4();
-	private static final String EXTERNAL_ID_SYSTEM_FOR_TEST = "http://testsystem.io/naming-system/empi";
+	private static final String EXTERNAL_ID_SYSTEM_FOR_TEST = "http://testsystem.io/naming-system/mdm";
 
-	private static final EmpiRulesJson ourRules = new EmpiRulesJson() {
+	private static final MdmRulesJson ourRules = new MdmRulesJson() {
 		{
 			setEnterpriseEIDSystem(EXTERNAL_ID_SYSTEM_FOR_TEST);
 			setMdmTypes(Arrays.asList(new String[] {"Patient"}));
 		}
 	};
 
-	private EmpiSettings myEmpiSettings;
+	private MdmSettings myMdmSettings;
 
 	private EIDHelper myEidHelper;
 
@@ -51,12 +50,12 @@ public class EIDHelperR4Test extends BaseR4Test {
 				new HashSet<>(), new HashSet<>(), RuntimeSearchParam.RuntimeSearchParamStatusEnum.ACTIVE
 			));
 
-		myEmpiSettings = new EmpiSettings(new EmpiRuleValidator(ourFhirContext, mySearchParamRetriever)) {
+		myMdmSettings = new MdmSettings(new MdmRuleValidator(ourFhirContext, mySearchParamRetriever)) {
 			{
-				setEmpiRules(ourRules);
+				setMdmRules(ourRules);
 			}
 		};
-		myEidHelper = new EIDHelper(ourFhirContext, myEmpiSettings);
+		myEidHelper = new EIDHelper(ourFhirContext, myMdmSettings);
 	}
 
 	@Test
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/PersonHelperDSTU3Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java
similarity index 86%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/PersonHelperDSTU3Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java
index 98ef7a6f26e..175e78b70d6 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/PersonHelperDSTU3Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java
@@ -1,9 +1,7 @@
-package ca.uhn.fhir.empi.svc;
+package ca.uhn.fhir.mdm.svc;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel;
-import ca.uhn.fhir.empi.util.PersonHelper;
-import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
 import org.hl7.fhir.dstu3.model.Person;
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.instance.model.api.IIdType;
@@ -11,23 +9,20 @@ import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import static ca.uhn.fhir.empi.util.TestUtils.createDummyContext;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class PersonHelperDSTU3Test {
+public class GoldenResourceHelperDSTU3Test {
 
 	public static final FhirContext ourFhirContext = FhirContext.forDstu3();
 	public static final String PATIENT_1 = "Patient/1";
 	public static final String PATIENT_2 = "Patient/2";
 	public static final String PATIENT_BAD = "Patient/BAD";
-	public static final PersonHelper MY_PERSON_HELPER = new PersonHelper(ourFhirContext);
+	public static final GoldenResourceHelper MY_PERSON_HELPER = new GoldenResourceHelper(ourFhirContext);
 
 	@Test
 	public void testGetLinks() {
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/PersonHelperR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java
similarity index 85%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/PersonHelperR4Test.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java
index 1dff85a5fd5..9f893141519 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/PersonHelperR4Test.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java
@@ -1,18 +1,11 @@
-package ca.uhn.fhir.empi.svc;
+package ca.uhn.fhir.mdm.svc;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel;
-import ca.uhn.fhir.empi.util.PersonHelper;
-import ca.uhn.fhir.model.primitive.IdDt;
-import org.hl7.fhir.instance.model.api.IIdType;
+import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
 import org.hl7.fhir.r4.model.Person;
 import org.hl7.fhir.r4.model.Reference;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static ca.uhn.fhir.empi.util.TestUtils.createDummyContext;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -20,13 +13,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class PersonHelperR4Test {
+public class GoldenResourceHelperR4Test {
 	public static final FhirContext ourFhirContext = FhirContext.forR4();
 	public static final String PATIENT_1 = "Patient/1";
 	public static final String PATIENT_2 = "Patient/2";
 	public static final String PATIENT_BAD = "Patient/BAD";
 
-	public static final PersonHelper MY_PERSON_HELPER = new PersonHelper(ourFhirContext);
+	public static final GoldenResourceHelper MY_PERSON_HELPER = new GoldenResourceHelper(ourFhirContext);
 
 	@Test
 	public void testGetLinks() {
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/NameUtilTestDSTU3.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java
similarity index 95%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/NameUtilTestDSTU3.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java
index 46529bd3b75..780f71c6f4e 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/NameUtilTestDSTU3.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.empi.svc;
+package ca.uhn.fhir.mdm.svc;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.util.NameUtil;
+import ca.uhn.fhir.mdm.util.NameUtil;
 import ca.uhn.fhir.util.FhirTerser;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.StringType;
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/NameUtilTestR4.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java
similarity index 95%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/NameUtilTestR4.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java
index 047f87f8374..35fb0dd2bb4 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/svc/NameUtilTestR4.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java
@@ -1,7 +1,7 @@
-package ca.uhn.fhir.empi.svc;
+package ca.uhn.fhir.mdm.svc;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.empi.util.NameUtil;
+import ca.uhn.fhir.mdm.util.NameUtil;
 import ca.uhn.fhir.util.FhirTerser;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.r4.model.Patient;
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/AssuranceLevelUtilTest.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java
similarity index 74%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/AssuranceLevelUtilTest.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java
index 4f75eda8c28..00c49a95538 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/AssuranceLevelUtilTest.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java
@@ -1,17 +1,17 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import org.junit.jupiter.api.Test;
 
-import static ca.uhn.fhir.empi.api.EmpiLinkSourceEnum.AUTO;
-import static ca.uhn.fhir.empi.api.EmpiLinkSourceEnum.MANUAL;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.MATCH;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.NO_MATCH;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.POSSIBLE_DUPLICATE;
-import static ca.uhn.fhir.empi.api.EmpiMatchResultEnum.POSSIBLE_MATCH;
-import static ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel.LEVEL1;
-import static ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel.LEVEL2;
-import static ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel.LEVEL3;
+import static ca.uhn.fhir.mdm.api.MdmLinkSourceEnum.AUTO;
+import static ca.uhn.fhir.mdm.api.MdmLinkSourceEnum.MANUAL;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.NO_MATCH;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.POSSIBLE_DUPLICATE;
+import static ca.uhn.fhir.mdm.api.MdmMatchResultEnum.POSSIBLE_MATCH;
+import static ca.uhn.fhir.mdm.model.CanonicalIdentityAssuranceLevel.LEVEL1;
+import static ca.uhn.fhir.mdm.model.CanonicalIdentityAssuranceLevel.LEVEL2;
+import static ca.uhn.fhir.mdm.model.CanonicalIdentityAssuranceLevel.LEVEL3;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/PrimitiveTypeComparingPredicateTest.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java
similarity index 98%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/PrimitiveTypeComparingPredicateTest.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java
index a4e0b24744d..5a01d025502 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/PrimitiveTypeComparingPredicateTest.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.util.FhirTerser;
diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/TestUtils.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java
similarity index 67%
rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/TestUtils.java
rename to hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java
index 400c0544473..b6e757f9590 100644
--- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/util/TestUtils.java
+++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java
@@ -1,6 +1,6 @@
-package ca.uhn.fhir.empi.util;
+package ca.uhn.fhir.mdm.util;
 
-import ca.uhn.fhir.empi.model.MdmTransactionContext;
+import ca.uhn.fhir.mdm.model.MdmTransactionContext;
 
 public class TestUtils {
 	public static MdmTransactionContext createDummyContext() {
diff --git a/pom.xml b/pom.xml
index 007d56779ea..db1c2244d8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2083,7 +2083,7 @@
 									<fileset dir="hapi-fhir-jpaserver-base/target/site/apidocs"/>
 								</copy>
 								<copy todir="target/site/apidocs-jpaserver-empi">
-									<fileset dir="hapi-fhir-jpaserver-empi/target/site/apidocs"/>
+									<fileset dir="hapi-fhir-jpaserver-mdm/target/site/apidocs"/>
 								</copy>
 								<copy todir="target/site/apidocs-jpaserver-batch">
 									<fileset dir="hapi-fhir-jpaserver-batch/target/site/apidocs"/>
@@ -2095,7 +2095,7 @@
 									<fileset dir="hapi-fhir-server/target/site/apidocs"/>
 								</copy>
 								<copy todir="target/site/apidocs-server-empi">
-									<fileset dir="hapi-fhir-server-empi/target/site/apidocs"/>
+									<fileset dir="hapi-fhir-server-mdm/target/site/apidocs"/>
 								</copy>
 								<copy todir="target/site/xref-jpaserver">
 									<fileset dir="hapi-fhir-jpaserver-base/target/site/xref"/>
@@ -2501,7 +2501,7 @@
 				<module>hapi-tinder-test</module>
 				<module>hapi-fhir-client</module>
 				<module>hapi-fhir-server</module>
-				<module>hapi-fhir-server-empi</module>
+				<module>hapi-fhir-server-mdm</module>
 				<module>hapi-fhir-converter</module>
 				<module>hapi-fhir-validation</module>
 				<!--<module>hapi-fhir-narrativegenerator</module>-->
@@ -2526,7 +2526,7 @@
 				<module>hapi-fhir-jaxrsserver-example</module>
 				<module>hapi-fhir-jpaserver-batch</module>
 				<module>hapi-fhir-jpaserver-base</module>
-				<module>hapi-fhir-jpaserver-empi</module>
+				<module>hapi-fhir-jpaserver-mdm</module>
 				<module>hapi-fhir-jpaserver-migrate</module>
 				<module>restful-server-example</module>
 				<module>hapi-fhir-testpage-overlay</module>