diff --git a/entity/AccountingAccountEntities.xml b/entity/AccountingAccountEntities.xml
index 2b691b2..dae96a5 100644
--- a/entity/AccountingAccountEntities.xml
+++ b/entity/AccountingAccountEntities.xml
@@ -100,7 +100,7 @@ along with this software (see the LICENSE.md file). If not, see
             <description>Calculated as actualBalance minus sum of outstanding FinancialAccountAuth.amount</description></field>
         <field name="replenishPaymentId" type="id"/>
         <field name="replenishLevel" type="currency-amount"/>
-        <relationship type="one" related="FinancialAccountType" short-alias="type">
+        <relationship type="one" related="mantle.account.financial.FinancialAccountType" short-alias="type">
             <key-map field-name="finAccountTypeId"/></relationship>
         <relationship type="one" title="FinancialAccount" related="moqui.basic.StatusItem" short-alias="status"/>
         <relationship type="one" title="Organization" related="mantle.party.Party" short-alias="organization">
@@ -698,7 +698,7 @@ along with this software (see the LICENSE.md file). If not, see
 
         <relationship type="one" title="Quantity" related="moqui.basic.Uom" short-alias="quantityUom">
             <key-map field-name="quantityUomId"/></relationship>
-        <relationship type="one" related="SalesOpportunity" short-alias="salesOpportunity"/>
+        <relationship type="one" related="mantle.sales.opportunity.SalesOpportunity" short-alias="salesOpportunity"/>
         <relationship type="one" related="mantle.other.tax.TaxAuthority" short-alias="taxAuthority"/>
         <relationship type="one" related="mantle.humanres.employment.PayrollAdjustment" short-alias="payrollAdjustment"/>
         <relationship type="one" related="mantle.account.financial.FinancialAccount" short-alias="financialAccount"/>
@@ -1373,7 +1373,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="amount" type="currency-amount"/>
         <relationship type="one" title="DeductionType" related="moqui.basic.Enumeration">
             <key-map field-name="deductionTypeEnumId"/></relationship>
-        <relationship type="one" related="Payment"/>
+        <relationship type="one" related="mantle.account.payment.Payment"/>
     </entity>
     <entity entity-name="Payment" package="mantle.account.payment" short-alias="payments" cache="never" optimistic-lock="true">
         <field name="paymentId" type="id" is-pk="true"/>
diff --git a/entity/AccountingLedgerEntities.xml b/entity/AccountingLedgerEntities.xml
index ec8a2bd..da64b5f 100644
--- a/entity/AccountingLedgerEntities.xml
+++ b/entity/AccountingLedgerEntities.xml
@@ -321,7 +321,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="finAccountTypeId" type="id" is-pk="true"/>
         <field name="organizationPartyId" type="id" is-pk="true"/>
         <field name="glAccountId" type="id"/>
-        <relationship type="one" related="FinancialAccountType"/>
+        <relationship type="one" related="mantle.account.financial.FinancialAccountType"/>
         <relationship type="one" title="Organization" related="mantle.party.Party">
             <key-map field-name="organizationPartyId"/></relationship>
         <relationship type="one" related="mantle.ledger.account.GlAccount"/>
@@ -417,7 +417,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="glAccountTypeEnumId" type="id" is-pk="true"/>
         <field name="glAccountId" type="id"><description>Revenue account for products in the category</description></field>
         <field name="contraGlAccountId" type="id"><description>Contra Revenue account for products in the category</description></field>
-        <relationship type="one" related="ProductCategory"/>
+        <relationship type="one" related="mantle.product.category.ProductCategory"/>
         <relationship type="one" title="Organization" related="mantle.party.Party">
             <key-map field-name="organizationPartyId"/></relationship>
         <relationship type="one" title="GlAccountType" related="moqui.basic.Enumeration">
@@ -441,7 +441,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="taxAuthorityId" type="id" is-pk="true"/>
         <field name="organizationPartyId" type="id" is-pk="true"/>
         <field name="glAccountId" type="id"/>
-        <relationship type="one" related="TaxAuthority"/>
+        <relationship type="one" related="mantle.other.tax.TaxAuthority"/>
         <relationship type="one" title="Organization" related="mantle.party.Party">
             <key-map field-name="organizationPartyId"/></relationship>
         <relationship type="one" related="mantle.ledger.account.GlAccount"/>
@@ -840,7 +840,7 @@ along with this software (see the LICENSE.md file). If not, see
         <relationship type="one" related="mantle.ledger.account.GlAccount" short-alias="glAccount"/>
         <relationship type="one" title="AcctgTransEntryReconcile" related="moqui.basic.StatusItem" short-alias="reconcileStatus">
             <key-map field-name="reconcileStatusId"/></relationship>
-        <relationship type="one" related="SettlementTerm" short-alias="settlementTerm"/>
+        <relationship type="one" related="mantle.account.invoice.SettlementTerm" short-alias="settlementTerm"/>
         <relationship type="one" related="mantle.product.Product" short-alias="product"/>
         <relationship type="one" related="mantle.product.asset.Asset" short-alias="asset"/>
 
diff --git a/entity/AccountingOtherEntities.xml b/entity/AccountingOtherEntities.xml
index a05f78f..b62d432 100644
--- a/entity/AccountingOtherEntities.xml
+++ b/entity/AccountingOtherEntities.xml
@@ -105,8 +105,8 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="partyId" type="id"/>
         <field name="budgetReviewResultEnumId" type="id"/>
         <field name="reviewDate" type="date-time"/>
-        <relationship type="one" related="Budget"/>
-        <relationship type="one" related="Party"/>
+        <relationship type="one" related="mantle.other.budget.Budget"/>
+        <relationship type="one" related="mantle.party.Party"/>
         <relationship type="one" title="BudgetReviewResult" related="moqui.basic.Enumeration">
             <key-map field-name="budgetReviewResultEnumId"/></relationship>
         <seed-data>
@@ -119,7 +119,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="revisionSeqId" type="id" is-pk="true"/>
         <field name="dateRevised" type="date-time"/>
         <field name="description" type="text-medium"/>
-        <relationship type="one" related="Budget"/>
+        <relationship type="one" related="mantle.other.budget.Budget"/>
     </entity>
     <entity entity-name="BudgetRevisionImpact" package="mantle.other.budget">
         <field name="budgetId" type="id" is-pk="true"/>
@@ -128,19 +128,19 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="revisedAmount" type="currency-amount"/>
         <field name="addDeleteFlag" type="text-indicator"/>
         <field name="revisionReason" type="text-medium"/>
-        <relationship type="one" related="Budget"/>
-        <relationship type="one" related="BudgetItem">
+        <relationship type="one" related="mantle.other.budget.Budget"/>
+        <relationship type="one" related="mantle.other.budget.BudgetItem">
             <key-map field-name="budgetId"/><key-map field-name="budgetItemSeqId"/></relationship>
-        <relationship type="one" related="BudgetRevision">
+        <relationship type="one" related="mantle.other.budget.BudgetRevision">
             <key-map field-name="budgetId"/><key-map field-name="revisionSeqId"/></relationship>
     </entity>
     <entity entity-name="BudgetParty" package="mantle.other.budget">
         <field name="budgetId" type="id" is-pk="true"/>
         <field name="partyId" type="id" is-pk="true"/>
         <field name="roleTypeId" type="id" is-pk="true"/>
-        <relationship type="one" related="Budget"/>
-        <relationship type="one" related="Party"/>
-        <relationship type="one" related="RoleType"/>
+        <relationship type="one" related="mantle.other.budget.Budget"/>
+        <relationship type="one" related="mantle.party.Party"/>
+        <relationship type="one" related="mantle.party.RoleType"/>
     </entity>
     <entity entity-name="BudgetScenario" package="mantle.other.budget">
         <field name="budgetScenarioId" type="id" is-pk="true"/>
@@ -153,9 +153,9 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="budgetItemSeqId" type="id"/>
         <field name="amountChange" type="currency-amount"/>
         <field name="percentageChange" type="number-decimal"/>
-        <relationship type="one" related="BudgetScenario"/>
-        <relationship type="one" related="Budget"/>
-        <relationship type="one" related="BudgetItem">
+        <relationship type="one" related="mantle.other.budget.BudgetScenario"/>
+        <relationship type="one" related="mantle.other.budget.Budget"/>
+        <relationship type="one" related="mantle.other.budget.BudgetItem">
             <key-map field-name="budgetId"/><key-map field-name="budgetItemSeqId"/></relationship>
     </entity>
     <entity entity-name="BudgetScenarioRule" package="mantle.other.budget">
@@ -163,7 +163,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="budgetItemTypeEnumId" type="id" is-pk="true"/>
         <field name="amountChange" type="currency-amount"/>
         <field name="percentageChange" type="number-decimal"/>
-        <relationship type="one" related="BudgetScenario"/>
+        <relationship type="one" related="mantle.other.budget.BudgetScenario"/>
         <relationship type="one" title="BudgetItemType" related="moqui.basic.Enumeration">
             <key-map field-name="budgetItemTypeEnumId"/></relationship>
     </entity>
@@ -254,8 +254,8 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="taxAuthGeoId"/><key-map field-name="taxAuthPartyId"/></relationship>
         <relationship type="one" title="TaxAuthorityRateType" related="moqui.basic.Enumeration">
             <key-map field-name="rateTypeEnumId"/></relationship>
-        <relationship type="one" related="ProductStore"/>
-        <relationship type="one" related="ProductCategory"/>
+        <relationship type="one" related="mantle.product.store.ProductStore"/>
+        <relationship type="one" related="mantle.product.category.ProductCategory"/>
         <seed-data>
             <!- - Tax Authority Rate Type - ->
             <moqui.basic.EnumerationType description="Tax Authority Rate Type" enumTypeId="TaxAuthorityRateType"/>
diff --git a/entity/HumanResourcesEntities.xml b/entity/HumanResourcesEntities.xml
index 577d0a9..d160450 100644
--- a/entity/HumanResourcesEntities.xml
+++ b/entity/HumanResourcesEntities.xml
@@ -362,15 +362,15 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="referredByPartyId" type="id"/>
         <field name="approverPartyId" type="id"/>
         <!-- not yet used: <field name="jobRequisitionId" type="id"/> -->
-        <relationship type="one" related="mantle.humanres.position.EmplPosition"/>
-        <relationship type="one" title="EmploymentApplication" related="moqui.basic.StatusItem"/>
+        <relationship type="one" related="mantle.humanres.position.EmplPosition" short-alias="position"/>
+        <relationship type="one" title="EmploymentApplication" related="moqui.basic.StatusItem" short-alias="status"/>
         <relationship type="one" title="EmploymentApplicationReferredBy" related="moqui.basic.Enumeration">
             <key-map field-name="referredByEnumId"/></relationship>
-        <relationship type="one" title="Applying" related="mantle.party.Party">
+        <relationship type="one" title="Applying" related="mantle.party.Party" short-alias="applyingParty">
             <key-map field-name="applyingPartyId"/></relationship>
-        <relationship type="one" title="ReferredBy" related="mantle.party.Party">
+        <relationship type="one" title="ReferredBy" related="mantle.party.Party" short-alias="referredParty">
             <key-map field-name="referredByPartyId"/></relationship>
-        <relationship type="one" title="Approver" related="mantle.party.Party">
+        <relationship type="one" title="Approver" related="mantle.party.Party" short-alias="approverParty">
             <key-map field-name="approverPartyId"/></relationship>
         <!-- <relationship type="one" related="mantle.humanres.recruitment.JobRequisition"/> -->
         <seed-data>
@@ -756,9 +756,9 @@ along with this software (see the LICENSE.md file). If not, see
         <relationship type="one" title="Organization" related="mantle.party.Party">
             <key-map field-name="organizationPartyId"/></relationship>
         <relationship type="one" related="mantle.humanres.position.EmplPositionClass"/>
-        <relationship type="one" title="EmplPosition" related="moqui.basic.StatusItem"/>
+        <relationship type="one" title="EmplPosition" related="moqui.basic.StatusItem" short-alias="status"/>
         <relationship type="one" related="mantle.humanres.rate.PayGrade"/>
-        <relationship type="one" related="BudgetItem">
+        <relationship type="one" related="mantle.other.budget.BudgetItem">
             <key-map field-name="budgetId"/><key-map field-name="budgetItemSeqId"/></relationship>
         <relationship type="one" title="EmplTaxExempt" related="moqui.basic.Enumeration">
             <key-map field-name="taxExemptEnumId"/></relationship>
diff --git a/entity/MarketingEntities.xml b/entity/MarketingEntities.xml
index 46c1175..ce70792 100644
--- a/entity/MarketingEntities.xml
+++ b/entity/MarketingEntities.xml
@@ -125,7 +125,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="fromDate" type="date-time" is-pk="true"/>
         <field name="thruDate" type="date-time"/>
         <field name="emailTemplateId" type="id"/>
-        <relationship type="one" related="ContactList"/>
+        <relationship type="one" related="mantle.marketing.contact.ContactList"/>
         <relationship type="one" title="ContactListEmailType" related="moqui.basic.Enumeration">
             <key-map field-name="emailTypeEnumId"/></relationship>
         <relationship type="one" related="moqui.basic.email.EmailTemplate"/>
@@ -202,7 +202,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="marketSegmentId" type="id" is-pk="true"/>
         <field name="fromDate" type="date-time" is-pk="true"/>
         <field name="thruDate" type="date-time"/>
-        <relationship type="one" related="ProductCategory"/>
+        <relationship type="one" related="mantle.product.category.ProductCategory"/>
         <relationship type="one" related="mantle.marketing.segment.MarketSegment"/>
     </entity>
     <entity entity-name="MarketSegment" package="mantle.marketing.segment">
diff --git a/entity/OrderEntities.xml b/entity/OrderEntities.xml
index 816f329..9873f3c 100644
--- a/entity/OrderEntities.xml
+++ b/entity/OrderEntities.xml
@@ -449,7 +449,7 @@ along with this software (see the LICENSE.md file). If not, see
         <relationship type="one" related="mantle.account.financial.FinancialAccountTrans" short-alias="financialAccountTrans"/>
         <relationship type="one" title="Override" related="mantle.ledger.account.GlAccount" short-alias="overrideGlAccount">
             <key-map field-name="overrideGlAccountId"/></relationship>
-        <relationship type="one" related="SalesOpportunity" short-alias="opportunity"/>
+        <relationship type="one" related="mantle.sales.opportunity.SalesOpportunity" short-alias="opportunity"/>
         <relationship type="one" related="mantle.other.tax.TaxAuthority" short-alias="taxAuthority"/>
 
         <relationship type="many" related="mantle.product.issuance.AssetReservation" short-alias="reservations">
@@ -597,7 +597,7 @@ along with this software (see the LICENSE.md file). If not, see
         <relationship type="many" title="Customer" related="mantle.party.PartyClassificationAppl" short-alias="customerClasses">
             <key-map field-name="customerPartyId" related="partyId"/></relationship>
 
-        <relationship type="one" related="Facility" short-alias="facility"/>
+        <relationship type="one" related="mantle.facility.Facility" short-alias="facility"/>
         <relationship type="one" title="Carrier" related="mantle.party.Party" short-alias="carrier">
             <key-map field-name="carrierPartyId"/></relationship>
         <relationship type="one" title="ShipmentMethod" related="moqui.basic.Enumeration" short-alias="shipmentMethod">
@@ -605,7 +605,7 @@ along with this software (see the LICENSE.md file). If not, see
         <!-- For tradeTermEnumId terms are defined with enumTypeId="TermType" in AccountingAccountEntities.xml -->
         <relationship type="one" title="TermType" related="moqui.basic.Enumeration" short-alias="tradeTermEnum">
             <key-map field-name="tradeTermEnumId"/></relationship>
-        <relationship type="one" related="SettlementTerm" short-alias="settlementTerm"/>
+        <relationship type="one" related="mantle.account.invoice.SettlementTerm" short-alias="settlementTerm"/>
 
         <relationship type="one" title="Postal" related="mantle.party.contact.ContactMech" short-alias="postal">
             <key-map field-name="postalContactMechId"/></relationship>
@@ -661,7 +661,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="orderPartSeqId" type="id" is-pk="true"/>
         <field name="settlementTermId" type="id" is-pk="true"/>
         <relationship type="one" related="mantle.order.OrderPart" short-alias="orderPart"/>
-        <relationship type="one" related="SettlementTerm" short-alias="term"/>
+        <relationship type="one" related="mantle.account.invoice.SettlementTerm" short-alias="term"/>
     </entity>
     <entity entity-name="OrderPromoCode" package="mantle.order" cache="never">
         <field name="orderId" type="id" is-pk="true"/>
diff --git a/entity/PartyEntities.xml b/entity/PartyEntities.xml
index c3a5e5f..d612420 100644
--- a/entity/PartyEntities.xml
+++ b/entity/PartyEntities.xml
@@ -1045,7 +1045,7 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="agreementId"/>
             <key-map field-name="agreementItemSeqId"/>
         </relationship>
-        <relationship type="one" related="Geo"/>
+        <relationship type="one" related="moqui.basic.Geo"/>
     </entity>
     <entity entity-name="AgreementItemParty" package="mantle.party.agreement">
         <field name="agreementId" type="id" is-pk="true"/>
@@ -1130,7 +1130,7 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="toPartyId" related="partyId"/></relationship>
         <relationship type="one" title="To" related="mantle.party.RoleType" short-alias="toRole">
             <key-map field-name="toRoleTypeId"/></relationship>
-        <relationship type="one" related="ContactList" short-alias="contactList"/>
+        <relationship type="one" related="mantle.marketing.contact.ContactList" short-alias="contactList"/>
         <relationship type="one" title="CommunicationEventReason" related="moqui.basic.Enumeration" short-alias="reason">
             <key-map field-name="reasonEnumId"/></relationship>
 
@@ -1491,16 +1491,25 @@ along with this software (see the LICENSE.md file). If not, see
                     description="Website URL - Primary"/>
             <ContactMechPurpose contactMechPurposeId="WebUrlPayment" contactMechTypeEnumId="CmtWebAddress"
                     description="Website URL - Payment (AR)"/>
-            <ContactMechPurpose contactMechPurposeId="WebUrlFacebook" contactMechTypeEnumId="CmtWebAddress"
-                    description="Website URL - Facebook"/>
+            <ContactMechPurpose contactMechPurposeId="WebRetailStore" contactMechTypeEnumId="CmtWebAddress"
+                    description="Website URL - Retail Store"/>        
             <ContactMechPurpose contactMechPurposeId="WebUrlICal" contactMechTypeEnumId="CmtWebAddress"
                     description="Website URL - iCal"/>
+
+            <ContactMechPurpose contactMechPurposeId="WebUrlFacebook" contactMechTypeEnumId="CmtWebAddress"
+                    description="Website URL - Facebook"/>
+            <ContactMechPurpose contactMechPurposeId="WebUrlInstagram" contactMechTypeEnumId="CmtWebAddress"
+                    description="Website URL - Instagram"/>
             <ContactMechPurpose contactMechPurposeId="WebUrlLinkedIn" contactMechTypeEnumId="CmtWebAddress"
                     description="Website URL - LinkedIn"/>
+            <ContactMechPurpose contactMechPurposeId="WebUrlSnapchat" contactMechTypeEnumId="CmtWebAddress"
+                    description="Website URL - Snapchat"/>
+            <ContactMechPurpose contactMechPurposeId="WebUrlTikTok" contactMechTypeEnumId="CmtWebAddress"
+                    description="Website URL - TikTok"/>
             <ContactMechPurpose contactMechPurposeId="WebUrlTwitter" contactMechTypeEnumId="CmtWebAddress"
-                    description="Website URL - Twitter"/>
-            <ContactMechPurpose contactMechPurposeId="WebRetailStore" contactMechTypeEnumId="CmtWebAddress"
-                    description="Website URL - Retail Store"/>
+                    description="Website URL - Twitter"/>                  
+                  
+
 
             <!-- General 'Other' purpose, mainly needed because PartyContactMech.contactMechPurposeId is a PK field, needs a non-null value -->
             <ContactMechPurpose contactMechPurposeId="Other" contactMechTypeEnumId="" description="Other"/>
diff --git a/entity/ProductAssetEntities.xml b/entity/ProductAssetEntities.xml
index a2b08f6..d378f1b 100644
--- a/entity/ProductAssetEntities.xml
+++ b/entity/ProductAssetEntities.xml
@@ -716,7 +716,7 @@ along with this software (see the LICENSE.md file). If not, see
         <relationship type="one" title="AssetMaintenance" related="moqui.basic.StatusItem"/>
         <relationship type="one" title="MaintenanceType" related="moqui.basic.Enumeration">
             <key-map field-name="maintenanceTypeEnumId"/></relationship>
-        <relationship type="one" related="ProductMaintenance"/>
+        <relationship type="one" related="mantle.product.maintenance.ProductMaintenance"/>
         <relationship type="one" title="Task" related="mantle.work.effort.WorkEffort">
             <key-map field-name="taskWorkEffortId"/></relationship>
         <relationship type="one" title="Interval" related="moqui.basic.Uom">
@@ -810,7 +810,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="registrationNumber" type="text-medium"/>
         <field name="licenseNumber" type="text-medium"/>
         <relationship type="one" related="mantle.product.asset.Asset"/>
-        <relationship type="one" title="GovAgency" related="Party">
+        <relationship type="one" title="GovAgency" related="mantle.party.Party">
             <key-map field-name="govAgencyPartyId"/></relationship>
     </entity>
 
diff --git a/entity/ProductDefinitionEntities.xml b/entity/ProductDefinitionEntities.xml
index fcacac2..dc3a265 100644
--- a/entity/ProductDefinitionEntities.xml
+++ b/entity/ProductDefinitionEntities.xml
@@ -629,7 +629,7 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="priceUomId"/></relationship>
         <relationship type="one" title="Term" related="moqui.basic.Uom" short-alias="termUom">
             <key-map field-name="termUomId"/></relationship>
-        <relationship type="one" related="ProductStore" short-alias="store"/>
+        <relationship type="one" related="mantle.product.store.ProductStore" short-alias="store"/>
         <relationship type="one" related="mantle.other.tax.TaxAuthority" short-alias="taxAuthority"/>
 
         <relationship type="one" title="SupplierPreferredOrder" related="moqui.basic.Enumeration" short-alias="supplierOrder">
diff --git a/entity/RequestEntities.xml b/entity/RequestEntities.xml
index 2eae7be..3ff898d 100644
--- a/entity/RequestEntities.xml
+++ b/entity/RequestEntities.xml
@@ -140,14 +140,14 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="description" type="text-medium"/>
         <relationship type="one" title="Parent" related="mantle.request.RequestCategory" short-alias="parent">
             <key-map field-name="parentCategoryId" related="requestCategoryId"/></relationship>
-        <relationship type="one" title="Responsible" related="Party" short-alias="responsible">
+        <relationship type="one" title="Responsible" related="mantle.party.Party" short-alias="responsible">
             <key-map field-name="responsiblePartyId"/></relationship>
     </entity>
     <entity entity-name="RequestCommEvent" package="mantle.request" cache="never">
         <field name="requestId" type="id" is-pk="true"/>
         <field name="communicationEventId" type="id" is-pk="true"/>
         <relationship type="one" related="mantle.request.Request" short-alias="request"/>
-        <relationship type="one" related="CommunicationEvent" short-alias="communicationEvent"/>
+        <relationship type="one" related="mantle.party.communication.CommunicationEvent" short-alias="communicationEvent"/>
     </entity>
     <entity entity-name="RequestContent" package="mantle.request" cache="never">
         <field name="requestContentId" type="id" is-pk="true"/>
@@ -320,7 +320,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="budgetId" type="id" is-pk="true"/>
         <field name="budgetItemSeqId" type="id" is-pk="true"/>
         <field name="amount" type="currency-amount"/>
-        <relationship type="one" related="BudgetItem">
+        <relationship type="one" related="mantle.other.budget.BudgetItem">
             <key-map field-name="budgetId"/>
             <key-map field-name="budgetItemSeqId"/>
         </relationship>