diff --git a/hapi-fhir-jpaserver-empi/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml similarity index 100% rename from hapi-fhir-jpaserver-empi/pom.xml rename to hapi-fhir-jpaserver-mdm/pom.xml diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmMessageHandler.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/broker/MdmQueueConsumerLoader.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmLoader.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSearchParameterLoader.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubscriptionLoader.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkFactory.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/IMdmStorageInterceptor.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmSubmitterInterceptorLoader.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/GoldenResourceMergerSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmChannelSubmitterSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmClearSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmEidUpdateService.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmGoldenResourceDeletingSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkUpdaterSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchFinderSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSearchParamSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/BaseCandidateFinder.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateList.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/CandidateStrategyEnum.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByEidSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByLinkSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/FindCandidateByScoreSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MatchedSourceResourceCandidate.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchCriteriaBuilderSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmCandidateSearchSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java rename to hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/candidate/MdmGoldenResourceFindingSvc.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/BaseTestMdmConfig.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/TestMdmConfigR4.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/dao/MdmLinkDaoSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/entity/MdmEnumTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/BaseMdmHelper.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperConfig.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmHelperR4.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/helper/MdmLinkHelper.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmExpungeTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/BaseSourceResourceMatcher.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsLinkedTo.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsMatchedToAPerson.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleDuplicateOf.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleLinkedTo.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsPossibleMatchWith.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/matcher/IsSameSourceResourceAs.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseLinkR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/BaseProviderR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderBatchR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderClearLinkR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMatchR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderMergePersonsR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderQueryLinkR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/provider/MdmProviderUpdateLinkR4Test.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/searchparam/SearchParameterTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/EmpiLinkUpdaterSvcImplTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmBatchSvcImplTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchCriteriaBuilderSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmCandidateSearchSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcMultipleEidModeTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmMatchLinkSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmPersonMergerSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceDaoSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcMockTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java rename to hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmResourceFilteringSvcTest.java diff --git a/hapi-fhir-jpaserver-empi/src/test/resources/empi/empi-rules.json b/hapi-fhir-jpaserver-mdm/src/test/resources/empi/empi-rules.json similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/resources/empi/empi-rules.json rename to hapi-fhir-jpaserver-mdm/src/test/resources/empi/empi-rules.json diff --git a/hapi-fhir-jpaserver-empi/src/test/resources/empi/empty-candidate-search-params.json b/hapi-fhir-jpaserver-mdm/src/test/resources/empi/empty-candidate-search-params.json similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/resources/empi/empty-candidate-search-params.json rename to hapi-fhir-jpaserver-mdm/src/test/resources/empi/empty-candidate-search-params.json diff --git a/hapi-fhir-jpaserver-empi/src/test/resources/logback-test.xml b/hapi-fhir-jpaserver-mdm/src/test/resources/logback-test.xml similarity index 100% rename from hapi-fhir-jpaserver-empi/src/test/resources/logback-test.xml rename to hapi-fhir-jpaserver-mdm/src/test/resources/logback-test.xml diff --git a/hapi-fhir-server-empi/pom.xml b/hapi-fhir-server-mdm/pom.xml similarity index 100% rename from hapi-fhir-server-empi/pom.xml rename to hapi-fhir-server-mdm/pom.xml diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IGoldenResourceMergerSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmChannelSubmitterSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmControllerSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmExpungeSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkQuerySvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmLinkUpdaterSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmMatchFinderSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmRuleValidator.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSettings.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MatchedTarget.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmConstants.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmLinkSourceEnum.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchEvaluation.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchOutcome.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/MdmMatchResultEnum.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/log/Logs.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/log/Logs.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/log/Logs.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/log/Logs.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalEID.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/CanonicalIdentityAssuranceLevel.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/model/MdmTransactionContext.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/BaseMdmProvider.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerUtil.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java similarity index 98% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java index 759ec679134..81a2a3e076c 100644 --- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderDstu3.java @@ -137,8 +137,8 @@ public class MdmProviderDstu3 extends BaseMdmProvider { @Operation(name = ProviderConstants.MDM_QUERY_LINKS) public Parameters queryLinks(@OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, min = 0, max = 1) StringType theGoldenResourceId, @OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_RESOURCE_ID, min = 0, max = 1) StringType theTargetResourceId, - @OperationParam(name=ProviderConstants.EMPI_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theMatchResult, - @OperationParam(name=ProviderConstants.EMPI_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theLinkSource, + @OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theMatchResult, + @OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theLinkSource, ServletRequestDetails theRequestDetails) { Stream empiLinkJson = myMdmControllerSvc.queryLinks(extractStringOrNull(theGoldenResourceId), extractStringOrNull(theTargetResourceId), diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderLoader.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java similarity index 98% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java index 8879244cdc0..7b2d757b8b3 100644 --- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmProviderR4.java @@ -190,8 +190,8 @@ public class MdmProviderR4 extends BaseMdmProvider { @Operation(name = ProviderConstants.MDM_QUERY_LINKS, idempotent = true) public Parameters queryLinks(@OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID, min = 0, max = 1) StringType theGoldenResourceId, @OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_RESOURCE_ID, min = 0, max = 1) StringType theResourceId, - @OperationParam(name=ProviderConstants.EMPI_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theMatchResult, - @OperationParam(name=ProviderConstants.EMPI_QUERY_LINKS_LINK_SOURCE, min = 0, max = 1) StringType theLinkSource, + @OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_MATCH_RESULT, min = 0, max = 1) StringType theMatchResult, + @OperationParam(name=ProviderConstants.MDM_QUERY_LINKS_LINK_SOURCE, min = 0, max = 1) StringType theLinkSource, ServletRequestDetails theRequestDetails) { Stream empiLinkJson = myMdmControllerSvc.queryLinks(extractStringOrNull(theGoldenResourceId), diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmSettings.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFieldMatchJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmFilterSearchParamJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmMatcherJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmResourceSearchParamJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/MdmSimilarityJson.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMap.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/BaseHapiStringMetric.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherDstu3.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiDateMatcherR4.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/HapiStringMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmFieldMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IMdmStringMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmMatcherEnum.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/MdmPersonNameMatchModeEnum.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NameMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/PhoneticEncoderMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/SubstringStringMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/HapiStringSimilarity.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/IMdmFieldSimilarity.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/similarity/MdmSimilarityEnum.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtil.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/CanonicalIdentifier.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/EIDHelper.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/GoldenResourceHelper.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/IdentifierUtil.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MessageHelper.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/NameUtil.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicate.java diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java similarity index 100% rename from hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java rename to hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/rest/server/TransactionLogMessages.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/BaseR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/api/MdmMatchOutcomeTest.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidatorTest.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/json/MdmRulesJsonR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/json/VectorMatchResultMapTest.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/BaseMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/DateMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/IdentifierMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/matcher/StringSimilarityR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/BaseMdmRulesR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/CustomResourceMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvcR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/rules/svc/ResourceMatcherR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/EIDHelperR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperDSTU3Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/GoldenResourceHelperR4Test.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestDSTU3.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/svc/NameUtilTestR4.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/util/AssuranceLevelUtilTest.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/util/PrimitiveTypeComparingPredicateTest.java diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java b/hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java similarity index 100% rename from hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java rename to hapi-fhir-server-mdm/src/test/java/ca/uhn/fhir/mdm/util/TestUtils.java diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-bad-filter.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-filter.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-bad-filter.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-filter.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-bad-path.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-path.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-bad-path.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-path.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-bad-searchparam.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-searchparam.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-bad-searchparam.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-searchparam.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-bad-url.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-url.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-bad-url.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-bad-url.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-duplicate-name.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-duplicate-name.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-duplicate-name.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-duplicate-name.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-missing-mdm-types.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-missing-mdm-types.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-missing-mdm-types.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-missing-mdm-types.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-missing-name.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-missing-name.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-missing-name.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-missing-name.json diff --git a/hapi-fhir-server-empi/src/test/resources/bad-rules-missing-threshold.json b/hapi-fhir-server-mdm/src/test/resources/bad-rules-missing-threshold.json similarity index 100% rename from hapi-fhir-server-empi/src/test/resources/bad-rules-missing-threshold.json rename to hapi-fhir-server-mdm/src/test/resources/bad-rules-missing-threshold.json diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java index 05a52cea317..3de765c2503 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java @@ -80,11 +80,11 @@ public class ProviderConstants { public static final String MDM_QUERY_LINKS = "$mdm-query-links"; public static final String MDM_QUERY_LINKS_GOLDEN_RESOURCE_ID = "goldenResourceId"; public static final String MDM_QUERY_LINKS_RESOURCE_ID = "resourceId"; - public static final String EMPI_QUERY_LINKS_MATCH_RESULT = "matchResult"; - public static final String EMPI_QUERY_LINKS_LINK_SOURCE = "linkSource"; + public static final String MDM_QUERY_LINKS_MATCH_RESULT = "matchResult"; + public static final String MDM_QUERY_LINKS_LINK_SOURCE = "linkSource"; - public static final String MDM_DUPLICATE_GOLDEN_RESOURCES = "$empi-duplicate-golden-resources"; - public static final String MDM_NOT_DUPLICATE = "$empi-not-duplicate"; + public static final String MDM_DUPLICATE_GOLDEN_RESOURCES = "$mdm-duplicate-golden-resources"; + public static final String MDM_NOT_DUPLICATE = "$mdm-not-duplicate"; public static final String MDM_CLEAR = "$mdm-clear"; public static final String MDM_CLEAR_TARGET_TYPE = "targetType";