rename clean up

Change-Id: I201fd4f047aad08c0ff4346b13e4b0b707fc525c