Modify format and name.

Modify format and name.