diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java
index 8715d353..fd2fef0f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModel.java
@@ -33,15 +33,6 @@ public class VIVOIndividualTemplateModel extends IndividualTemplateModel {
         super(individual, vreq);
     }
 
-    public static void setAsDefault() {
-        IndividualTemplateModelBuilder.setCustomBuilder(new IndividualTemplateModelBuilder.IIndividualTemplateModelBuilder() {
-            @Override
-            public VIVOIndividualTemplateModel build(Individual individual, VitroRequest vreq) {
-                return new VIVOIndividualTemplateModel(individual, vreq);
-            }
-        });
-    }
-    
     private String getVisUrl(String visPath) {
         String visUrl;
         boolean isUsingDefaultNameSpace = UrlBuilder.isUriInDefaultNamespace(
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModelBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModelBuilder.java
new file mode 100644
index 00000000..b4481bfa
--- /dev/null
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/VIVOIndividualTemplateModelBuilder.java
@@ -0,0 +1,11 @@
+package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+
+public class VIVOIndividualTemplateModelBuilder implements IndividualTemplateModelBuilder.IIndividualTemplateModelBuilder {
+    @Override
+    public VIVOIndividualTemplateModel build(Individual individual, VitroRequest vreq) {
+        return new VIVOIndividualTemplateModel(individual, vreq);
+    }
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
index ab03c272..c6230fb8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividual.java
@@ -33,16 +33,6 @@ public class VIVOListedIndividual extends ListedIndividual {
         title = findPreferredTitle();
     }
 
-    public static void setAsDefault() {
-        ListedIndividualBuilder.setCustomBuilder(new ListedIndividualBuilder.ILIstedIndividualBuilder() {
-            @Override
-            public ListedIndividual build(Individual individual, VitroRequest vreq) {
-                return new VIVOListedIndividual(individual, vreq);
-            }
-        });
-
-    }
-
     private String findPreferredTitle() {
         String queryStr = QueryUtils.subUriForQueryVar(VCARD_DATA_QUERY, "subject", individual.getURI());
         log.debug("queryStr = " + queryStr);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividualBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividualBuilder.java
new file mode 100644
index 00000000..6d3aa5f1
--- /dev/null
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/VIVOListedIndividualBuilder.java
@@ -0,0 +1,11 @@
+package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+
+public class VIVOListedIndividualBuilder implements ListedIndividualBuilder.ILIstedIndividualBuilder {
+    @Override
+    public ListedIndividual build(Individual individual, VitroRequest vreq) {
+        return new VIVOListedIndividual(individual, vreq);
+    }
+}
diff --git a/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java
index 0cea0bed..f1e2dd44 100644
--- a/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java
+++ b/api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java
@@ -4,9 +4,11 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModel;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModelBuilder;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.VIVOListedIndividual;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.VIVOListedIndividualBuilder;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -14,8 +16,8 @@ import javax.servlet.ServletContextListener;
 public class TemplateModelSetup implements ServletContextListener {
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-        VIVOIndividualTemplateModel.setAsDefault();
-        VIVOListedIndividual.setAsDefault();
+        IndividualTemplateModelBuilder.setCustomBuilder(new VIVOIndividualTemplateModelBuilder());
+        ListedIndividualBuilder.setCustomBuilder(new VIVOListedIndividualBuilder());
     }
 
     @Override