fix format and naming issue