Rename and skeleton implementation of some interfaces and classes.
Merge remote-tracking branch 'upstream/master' into add_stubs