Make formats use underscores not hyphens