I limited the renaming to things that are not in the public API and are not setting names. This is probably more than we strictly need to do, but at least this will help doing potential future similar 'grep' exercises.