Update to new names and move clear to script.

Change-Id: Id6ba9cb5d90587509668acac930495bb7911b283
3 files changed