diff --git a/include/sta/Sta.hh b/include/sta/Sta.hh
index a343d924..5425aa99 100644
--- a/include/sta/Sta.hh
+++ b/include/sta/Sta.hh
@@ -937,8 +937,9 @@ public:
   void delaysInvalid();
   // Invalidate all arrival and required times.
   void arrivalsInvalid();
-  PinSet startpoints();
-  PinSet endpoints();
+  PinSet startpointPins();
+  PinSet endpointPins();
+  VertexSet *endpoints();
   int endpointViolationCount(const MinMax *min_max);
   // Find the fanin vertices for a group path.
   // Vertices in the clock network are NOT included.
diff --git a/search/Sta.cc b/search/Sta.cc
index 04c0ef4d..6b77b365 100644
--- a/search/Sta.cc
+++ b/search/Sta.cc
@@ -2659,7 +2659,7 @@ Sta::ensureClkArrivals()
 ////////////////////////////////////////////////////////////////
 
 PinSet
-Sta::startpoints()
+Sta::startpointPins()
 {
   ensureGraph();
   PinSet pins(network_);
@@ -2668,8 +2668,15 @@ Sta::startpoints()
   return pins;
 }
 
-PinSet
+VertexSet *
 Sta::endpoints()
+{
+  ensureGraph();
+  return search_->endpoints();
+}
+
+PinSet
+Sta::endpointPins()
 {
   ensureGraph();
   PinSet pins(network_);
diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i
index 4aebec68..12fb18e6 100644
--- a/tcl/StaTcl.i
+++ b/tcl/StaTcl.i
@@ -3055,13 +3055,13 @@ worst_clk_skew_cmd(const SetupHold *setup_hold)
 PinSet
 startpoints()
 {
-  return Sta::sta()->startpoints();
+  return Sta::sta()->startpointPins();
 }
 
 PinSet
 endpoints()
 {
-  return Sta::sta()->endpoints();
+  return Sta::sta()->endpointPins();
 }
 
 PinSet
@@ -4058,12 +4058,6 @@ port_location(const Port *port)
   return pin_location(pin);
 }
 
-int
-endpoint_count()
-{
-  return Sta::sta()->endpoints().size();
-}
-
 int
 endpoint_violation_count(const MinMax *min_max)
 {