Fix the format and binary name