diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
index 7b1445fc..964855f8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java
@@ -1,13 +1,18 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
 
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public class N3TransitionToV2Mapping extends HashMap<String, String>{        
     public N3TransitionToV2Mapping(){
         Map<String,String> map = this;
-        
+
+        map.put("defaultAddMissingIndividualForm.jsp",
+                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator.class.getName());
+
         // vivo forms:
 
         map.put("addAuthorsToInformationResource.jsp",                
@@ -15,7 +20,7 @@ public class N3TransitionToV2Mapping extends HashMap<String, String>{
         map.put("manageWebpagesForIndividual.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator.class.getName());
         map.put("newIndividualForm.jsp",
-                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator.class.getName());
+                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator.class.getName());
         map.put("organizationHasPositionHistory.jsp",
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator.class.getName());
         map.put("personHasEducationalTraining.jsp",
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
index a8844c7e..d2a13d2a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVODefaultAddMissingIndividualFormGenerator.java
@@ -26,10 +26,6 @@ public class VIVODefaultAddMissingIndividualFormGenerator extends DefaultAddMiss
 	
 	private Log log = LogFactory.getLog(VIVODefaultAddMissingIndividualFormGenerator.class);
 
-	public static void register() {
-		DefaultAddMissingIndividualFormGenerator.registerGeneratorClass(VIVOIndividualSearchResult.class);
-	}
-
     protected Map<String, String> generateNewResources(VitroRequest vreq) {
 		Map<String, String> newResources = super.generateNewResources(vreq);
 		newResources.put("newVcardInd", null);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
similarity index 98%
rename from api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
rename to api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
index f736c26d..3b232709 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VIVONewIndividualFormGenerator.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.
  * Generates the edit configuration for a default property form.
  * ModelChangePreprocessor creates the rdfs:label statement. 
  */
-public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
+public class VIVONewIndividualFormGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
 
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
diff --git a/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java b/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java
index c9a23034..e728562e 100644
--- a/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java
+++ b/api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java
@@ -1,5 +1,6 @@
 package org.vivoweb.webapp.startup;
 
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult;
 
@@ -9,7 +10,11 @@ import javax.servlet.ServletContextListener;
 public class GeneratorSetup implements ServletContextListener {
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-        VIVODefaultAddMissingIndividualFormGenerator.register();
+        JspToGeneratorMapping.jspsToGenerators.put("defaultAddMissingIndividualForm.jsp",
+                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator.class.getName());
+
+        JspToGeneratorMapping.jspsToGenerators.put("newIndividualForm.jsp",
+                        edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator.class.getName());
     }
 
     @Override
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl
new file mode 100644
index 00000000..8a492ceb
--- /dev/null
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-generator-classes.ftl
@@ -0,0 +1,4 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#assign ManageLabelsGenerator      = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVOManageLabelsGenerator" />
+<#assign NewIndividualFormGenerator = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVONewIndividualFormGenerator" />
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties-classes.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties-classes.ftl
deleted file mode 100644
index 0a8ee084..00000000
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties-classes.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#function class_ManageLabelsGenerator>
-    <#return "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVOManageLabelsGenerator" />
-</#function>
\ No newline at end of file