Name changes due to changes in TOC.
Cleanup.
Updates due to TOC changes