When talking about interfaces, use the interface names, not the names

of the implementation classes.  (Remove the "Impl" from two names.)