diff --git a/snd/src/org/labkey/snd/pipeline/SNDDataHandler.java b/snd/src/org/labkey/snd/pipeline/SNDDataHandler.java
index 6c1e1888e..977f00454 100644
--- a/snd/src/org/labkey/snd/pipeline/SNDDataHandler.java
+++ b/snd/src/org/labkey/snd/pipeline/SNDDataHandler.java
@@ -28,7 +28,7 @@
 import org.labkey.api.exp.api.DataType;
 import org.labkey.api.exp.api.ExpData;
 import org.labkey.api.exp.api.ExpRun;
-import org.labkey.api.exp.property.DefaultPropertyValidator;
+import org.labkey.api.exp.property.DefaultValidatorKind;
 import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
 import org.labkey.api.gwt.client.model.GWTPropertyValidator;
 import org.labkey.api.gwt.client.model.PropertyValidatorType;
@@ -269,7 +269,7 @@ private List<GWTPropertyDescriptor> getAttributes(PackageType packageType, @NotN
                     // Length typeUri has been deprecated, these should be saved as textlength
                     String typeUri = validator.getTypeURI();
                     if ("urn:lsid:labkey.com:PropertyValidator:length".equals(typeUri))
-                        typeUri = DefaultPropertyValidator.createValidatorURI(PropertyValidatorType.TextLength).toString();
+                        typeUri = DefaultValidatorKind.createValidatorURI(PropertyValidatorType.TextLength).toString();
 
                     Lsid lsid = new Lsid(typeUri);
                     gwtPropertyValidator.setType(org.labkey.api.gwt.client.model.PropertyValidatorType.getType(lsid.getObjectId()));//typeURI
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/steps/PackageLoadTask.java b/snprc_ehr/src/org/labkey/snprc_ehr/steps/PackageLoadTask.java
index 29da147f9..f94f0376d 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/steps/PackageLoadTask.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/steps/PackageLoadTask.java
@@ -23,7 +23,7 @@
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.di.TaskRefTaskImpl;
 import org.labkey.api.exp.Lsid;
-import org.labkey.api.exp.property.DefaultPropertyValidator;
+import org.labkey.api.exp.property.DefaultValidatorKind;
 import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
 import org.labkey.api.gwt.client.model.GWTPropertyValidator;
 import org.labkey.api.gwt.client.model.PropertyValidatorType;
@@ -220,7 +220,7 @@ private List<GWTPropertyDescriptor> getAttributes(int pkgId, PipelineJob job) th
                     gwtPropertyValidator.setExpression(validatorExpression); //expression
 
                     // Default Property Validator type to "Range"
-                    String typeUri = DefaultPropertyValidator.createValidatorURI(PropertyValidatorType.Range).toString();
+                    String typeUri = DefaultValidatorKind.createValidatorURI(PropertyValidatorType.Range).toString();
                     Lsid lsid = new Lsid(typeUri);
                     gwtPropertyValidator.setType(PropertyValidatorType.getType(lsid.getObjectId()));
                     gwtPropertyValidatorList.add(gwtPropertyValidator);