Re: [master] Use format's name instead of type