Cleanup the API. Like other PRs similar to this the name changes are intended to be breaking changes, the visibility changes can be reversed and aren't intended to force people to use reflection to call private APIs (please don't) and can be switched back to public.