More cleanup on platform => webcomponents rename

This brings the transition branch up to date with master & makes some manual fixes.

If you merge master into the branch separately, you should just see the changes I made.