Rename some interfaces to have an I prefix
Format