Add interface to allow fakes
Restore class name, rename interface
Merge from candidate