More renames

Change-Id: Ife9282266a0c906c6de4cda23f6c961dc39f76ba