diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/AppClientEntrypoints.java b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/AppClientEntrypoints.java
index efee3c3e3..e534b40cc 100644
--- a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/AppClientEntrypoints.java
+++ b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/AppClientEntrypoints.java
@@ -22,7 +22,6 @@ import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.Entrypoints;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.j2ee.util.TopLevelArchiveModule;
@@ -44,7 +43,7 @@ import com.ibm.wala.util.warnings.WarningSet;
  * 
  * @author sfink
  */
-public class AppClientEntrypoints implements Entrypoints {
+public class AppClientEntrypoints implements Iterable<Entrypoint> {
 
   static final boolean DEBUG = false;
 
diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/EJBEntrypoints.java b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/EJBEntrypoints.java
index be7d421c8..68e4c86a8 100644
--- a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/EJBEntrypoints.java
+++ b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/EJBEntrypoints.java
@@ -30,7 +30,6 @@ import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.Entrypoints;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -53,7 +52,7 @@ import com.ibm.wala.util.warnings.WarningSet;
  * 
  * @author sfink
  */
-public class EJBEntrypoints implements Entrypoints, EJBConstants {
+public class EJBEntrypoints implements Iterable<Entrypoint>, EJBConstants {
   static final boolean DEBUG = false;
 
   private final ClassHierarchy cha;
diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEEntrypoints.java b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEEntrypoints.java
index 4b70dec4b..f7a3d1880 100644
--- a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEEntrypoints.java
+++ b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/J2EEEntrypoints.java
@@ -13,7 +13,6 @@ package com.ibm.wala.j2ee;
 import java.util.Iterator;
 
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.Entrypoints;
 import com.ibm.wala.ipa.callgraph.impl.ComposedEntrypoints;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.util.Atom;
@@ -25,11 +24,11 @@ import com.ibm.wala.util.warnings.WarningSet;
  * 
  * @author sfink
  */
-public class J2EEEntrypoints implements Entrypoints {
+public class J2EEEntrypoints implements Iterable<Entrypoint> {
 
   private final static boolean USE_STRUTS_ACTIONS = true;
 
-  private Entrypoints entrypoints;
+  private Iterable<Entrypoint> entrypoints;
 
   private final AppClientEntrypoints appClientEntrypoints;
 
diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/ServletEntrypoints.java b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/ServletEntrypoints.java
index c16f41ef8..b1f49dd63 100644
--- a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/ServletEntrypoints.java
+++ b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/ServletEntrypoints.java
@@ -18,7 +18,6 @@ import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.Entrypoints;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -41,7 +40,7 @@ import com.ibm.wala.util.debug.Trace;
  * 
  * @author sfink
  */
-public class ServletEntrypoints implements Entrypoints, EJBConstants {
+public class ServletEntrypoints implements Iterable<Entrypoint>, EJBConstants {
 
   static final boolean DEBUG = false;
 
diff --git a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/StrutsEntrypoints.java b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/StrutsEntrypoints.java
index bfa27a02b..5984b10b0 100644
--- a/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/StrutsEntrypoints.java
+++ b/com.ibm.wala.j2ee/src/com/ibm/wala/j2ee/StrutsEntrypoints.java
@@ -19,7 +19,6 @@ import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.Entrypoints;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
@@ -41,7 +40,7 @@ import com.ibm.wala.util.debug.Assertions;
  * 
  * @author sfink
  */
-public class StrutsEntrypoints implements Entrypoints, EJBConstants {
+public class StrutsEntrypoints implements Iterable<Entrypoint>, EJBConstants {
 
   public final static Atom executeName = Atom.findOrCreateUnicodeAtom("execute");