Format name

Change-Id: Iad343c1990a97125790fba90320a678846d44b94