Some format name changes to clarify what they are.