Change interface names to fit in the new smaller interface surface and
correct method names on interfaces.
2 files changed