diff --git a/src/org/labkey/targetedms/TargetedMSController.java b/src/org/labkey/targetedms/TargetedMSController.java
index 40eeae4a8..bbc27f039 100644
--- a/src/org/labkey/targetedms/TargetedMSController.java
+++ b/src/org/labkey/targetedms/TargetedMSController.java
@@ -140,7 +140,7 @@
 import org.labkey.api.targetedms.TargetedMSUrls;
 import org.labkey.api.targetedms.model.QCMetricConfiguration;
 import org.labkey.api.targetedms.model.SampleFileInfo;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ConfigurationException;
 import org.labkey.api.util.ContainerContext;
 import org.labkey.api.util.DOM;
@@ -149,7 +149,7 @@
 import org.labkey.api.util.HelpTopic;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.JsonUtil;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.StringUtilsLabKey;
@@ -545,7 +545,7 @@ public ModelAndView getView(ChromatogramCrawlerForm form, boolean reshow, BindEx
         {
             return new HtmlView("Chromatogram Crawler", DIV("Crawl all containers under the parent " + getContainer().getPath(),
                 DOM.LK.FORM(at(method, "POST"),
-                    new Button.ButtonBuilder("Start Crawl").submit(true).build())));
+                    new ButtonBuilder("Start Crawl").submit(true).build())));
         }
 
         @Override
@@ -5346,7 +5346,7 @@ public static Integer addProteinSummaryViews(VBox box, PeptideGroup group, Targe
 
             for (IKeyword keyword : keywords)
             {
-                HtmlString link = new Link.LinkBuilder(keyword.label).href("https://www.uniprot.org/keywords/" + keyword.id).target("_blank").clearClasses().getHtmlString();
+                HtmlString link = new LinkBuilder(keyword.label).href("https://www.uniprot.org/keywords/" + keyword.id).target("_blank").clearClasses().getHtmlString();
                 if (IKeyword.BIOLOGICAL_PROCESS_CATEGORY.equals(keyword.categoryId))
                     extraAnnotations.computeIfAbsent("Biological Processes", k -> new ArrayList<>()).add(link);
                 if (IKeyword.MOLECULAR_FUNCTION_CATEGORY.equals(keyword.categoryId))