diff --git a/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java b/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
index c2a4d1fb42a..8be8d19a58b 100644
--- a/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
+++ b/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
@@ -488,6 +488,7 @@ public void validateOptions(Container container, User user, SampleTypeDomainKind
             ExpSampleType sampleType = options.getRowId() >= 0 ? ss.getSampleType(options.getRowId()) : null;
             Domain stDomain = sampleType != null ? sampleType.getDomain() : null;
             Set<String> reservedNames = new CaseInsensitiveHashSet(this.getReservedPropertyNames(stDomain, user));
+            reservedNames.add("Parent"); // Issue 52627: Don't allow "Parent" to be used for lineage parent import alias
             Set<String> existingAliases = new CaseInsensitiveHashSet();
 
             try
diff --git a/experiment/src/org/labkey/experiment/PropertyQueryChangeListener.java b/experiment/src/org/labkey/experiment/PropertyQueryChangeListener.java
index 854d6f3b915..65e879b53bd 100644
--- a/experiment/src/org/labkey/experiment/PropertyQueryChangeListener.java
+++ b/experiment/src/org/labkey/experiment/PropertyQueryChangeListener.java
@@ -63,6 +63,9 @@ private void updateLookupSchema(String newValue, String oldSchema, Container con
     @Override
     public void queryChanged(User user, Container container, ContainerFilter scope, SchemaKey schema, @NotNull QueryProperty property, @NotNull Collection<QueryPropertyChange<?>> changes)
     {
+        if (!property.equals(QueryProperty.SchemaName) && !property.equals(QueryProperty.Name)) // Issue 53846
+            return;
+
         // is there any other schema change other than assay renaming?
         boolean isSchemaChange = schema.toString().toLowerCase().startsWith("assay.general.");