TBR: TODOs: Renames now that hierarchy is clear

Change-Id: If52fea78d0cf7e4bdd0c3906b0b35ea9833cacf2
10 files changed