format errors, new names

Change-Id: Ida2ae8906e761a4c757e06cf0edea057adfdae79