diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/FakeSelfEditingIdentifierFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/FakeSelfEditingIdentifierFactory.java
index 46a6128ce..273714dea 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/FakeSelfEditingIdentifierFactory.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/FakeSelfEditingIdentifierFactory.java
@@ -12,7 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 /** 
- * Attempts to simulate the action of NetIdIdentifierFactory.java using the
+ * Attempts to simulate the action of SelfEditingIdentifierFactory.java using the
  * request attribute FAKE_SELF_EDIT_NETID.
  */
 public class FakeSelfEditingIdentifierFactory implements IdentifierBundleFactory{    
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java
index a2af33e03..385c10352 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java
@@ -361,7 +361,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
     /**
      * An inner class used to setup everything that's needed for
      * a JenaNetidPolicy.  This setups the JenaNetidPolicy and a
-     * NetIdIdentifierFactory.
+     * SelfEditingIdentifierFactory.
      *
      * @author bdc34
      *
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java
index 4815fe9a3..286e66520 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/JenaNetidPolicySetup.java
@@ -14,11 +14,10 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFac
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy.ContextSetup;
 
 /**
  * Class used to setup a JenaNetidPolicy using the default.  
- * This setups the JenaNetidPolicy and a NetIdIdentifierFactory.
+ * This setups the JenaNetidPolicy and a SelfEditingIdentifierFactory.
  * 
  * See JenaNetidPolicy.setupDefault() for the sparql queries that will
  * be used by the default JenaNetidPolicy.
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
index 29ed82deb..b7e16f7dc 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
@@ -58,7 +58,7 @@ public class SelfEditingPolicyTest extends AbstractTestClass {
         
         
         ids = new ArrayIdentifierBundle();
-        //ids.add( new NetIdIdentifierFactory.NetId("test223") );
+        ids.add( new SelfEditingIdentifierFactory.NetId("test223") );
         
         IndividualImpl ind = new IndividualImpl();
         ind.setURI( SELFEDITOR_URI );        
diff --git a/webapp/web/admin/testnetid.jsp b/webapp/web/admin/testnetid.jsp
index 10b77821e..b68fc4e00 100644
--- a/webapp/web/admin/testnetid.jsp
+++ b/webapp/web/admin/testnetid.jsp
@@ -18,10 +18,9 @@
 <%@ page import="org.apache.commons.logging.LogFactory" %>
 <%@ page import="java.io.StringReader" %>
 <%@ page import="java.util.*" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.NetIdIdentifierFactory.NetId"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.NetIdIdentifierFactory"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingUriFactory.SelfEditing"%>
-<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingUriFactory"%>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.NetId"%>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing"%>
+<%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle"%>
 <%@page import="java.io.IOException"%>
@@ -51,8 +50,8 @@ private void checkNetId( String inNetId, JspWriter out, HttpServletRequest reque
             && inNetId.length() > 0
             && inNetId.length() < 100 ){
     
-        NetIdIdentifierFactory.NetId netid = new NetId(inNetId);                        
-        SelfEditingUriFactory.SelfEditing selfE = null;
+        SelfEditingIdentifierFactory.NetId netid = new NetId(inNetId);                        
+        SelfEditingIdentifierFactory.SelfEditing selfE = null;
                 
         IdentifierBundle idb = new ArrayIdentifierBundle();
         idb.add(netid);