Updating TOC, adjusting page names...that sort of thing. Change-Id: I1a6cf66291344e5c210f287c1d38c65d621cfe91