Some renaming

Change-Id: Ifa490815ee9fe23fa8c20f54f307455cfb02381b