diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
index d4c61ec6..197b2d6d 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
@@ -28,8 +28,8 @@
 import org.labkey.api.module.ModuleContext;
 import org.labkey.api.module.SpringModule;
 import org.labkey.api.pipeline.PipelineService;
-import org.labkey.api.protein.PeptideSearchForm;
-import org.labkey.api.protein.ProteinSearchForm;
+import org.labkey.api.protein.search.PeptideSearchForm;
+import org.labkey.api.protein.search.ProteinSearchForm;
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.security.roles.RoleManager;
 import org.labkey.api.settings.AdminConsole;
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
index 04738ac4..6212caf0 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicPeptideSearch.jsp
@@ -16,8 +16,8 @@
  */
 %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
-<%@ page import="org.labkey.api.ms2.MS2Urls" %>
-<%@ page import="org.labkey.api.protein.PeptideSearchForm" %>
+<%@ page import="org.labkey.api.protein.search.PeptideSearchForm" %>
+<%@ page import="org.labkey.api.protein.ProteinService" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
@@ -26,7 +26,7 @@
     PeptideSearchForm model = me.getModelBean();
 %>
 
-<labkey:form action="<%=urlProvider(MS2Urls.class).getPepSearchUrl(getContainer())%>" method="get">
+<labkey:form action="<%=ProteinService.get().getPeptideSearchUrl(getContainer())%>" method="get">
     <table class="lk-fields-table">
         <tr>
             <td class="labkey-form-label"><label for="pepSeq">Peptide sequence</label> *<%=helpPopup("Peptide Sequence", "Enter the peptide sequence to find, or multiple sequences separated by commas. Use * to match any sequence of characters.")%></td>
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
index 8eb7e9fd..be2e5475 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaPublicProteinSearch.jsp
@@ -16,8 +16,8 @@
  */
 %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
-<%@ page import="org.labkey.api.ms2.MS2Urls" %>
-<%@ page import="org.labkey.api.protein.ProteinSearchForm" %>
+<%@ page import="org.labkey.api.protein.ProteinService" %>
+<%@ page import="org.labkey.api.protein.search.ProteinSearchForm" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
@@ -25,7 +25,7 @@
     JspView<ProteinSearchForm> me = (JspView<ProteinSearchForm>) HttpView.currentView();
     ProteinSearchForm bean = me.getModelBean();
 %>
-<labkey:form action="<%=urlProvider(MS2Urls.class).getProteinSearchUrl(getContainer())%>">
+<labkey:form action="<%=ProteinService.get().getProteinSearchUrl(getContainer())%>">
     <table class="lk-fields-table">
         <tr>
             <td class="labkey-form-label">Protein name *<%= helpPopup("Protein name", "Required to search for proteins. You may use the name as specified by the FASTA file, or an annotation, such as a gene name, that has been loaded from an annotations file. You may comma separate multiple names.") %></td>