Update names and move clear to script.

Change-Id: I17af3cd027248f52ce6516f81968c6b3d976a09d
3 files changed