Consistently capitalize Components, clean up a few transitions.