diff --git a/picard/formats/apev2.py b/picard/formats/apev2.py
index f768f5bd0..010c61b90 100644
--- a/picard/formats/apev2.py
+++ b/picard/formats/apev2.py
@@ -112,7 +112,7 @@ class MusepackFile(APEv2File):
     _File = mutagen.musepack.Musepack
     def _info(self, file):
         super(MusepackFile, self)._info(file)
-        self.metadata['~format'] = 'Musepack, SV%d' % file.info.version
+        self.metadata['~format'] = "Musepack, SV%d" % file.info.version
 
 class WavPackFile(APEv2File):
     """WavPack file."""
@@ -121,7 +121,7 @@ class WavPackFile(APEv2File):
     _File = mutagen.wavpack.WavPack
     def _info(self, file):
         super(WavPackFile, self)._info(file)
-        self.metadata['~format'] = 'WavPack'
+        self.metadata['~format'] = self.NAME
 
 class OptimFROGFile(APEv2File):
     """OptimFROG file."""
@@ -130,7 +130,10 @@ class OptimFROGFile(APEv2File):
     _File = mutagenext.optimfrog.OptimFROG
     def _info(self, file):
         super(OptimFROGFile, self)._info(file)
-        self.metadata['~format'] = 'OptimFROG'
+        if self.filename.lower().endswith(".ofs"):
+            self.metadata['~format'] = "OptimFROG DualStream Audio"
+        else:
+            self.metadata['~format'] = "OptimFROG Lossless Audio"
 
 class MonkeysAudioFile(APEv2File):
     """Monkey's Audio file."""
@@ -139,4 +142,4 @@ class MonkeysAudioFile(APEv2File):
     _File = mutagen.monkeysaudio.MonkeysAudio
     def _info(self, file):
         super(MonkeysAudioFile, self)._info(file)
-        self.metadata['~format'] = 'Monkey\'s Audio'
+        self.metadata['~format'] = self.NAME
diff --git a/picard/formats/vorbis.py b/picard/formats/vorbis.py
index 39b7787e1..ad7db08d0 100644
--- a/picard/formats/vorbis.py
+++ b/picard/formats/vorbis.py
@@ -69,7 +69,7 @@ class FLACFile(VCommentFile):
     _File = mutagen.flac.FLAC
     def _info(self, file):
         super(FLACFile, self)._info(file)
-        self.metadata['~format'] = 'FLAC'
+        self.metadata['~format'] = self.NAME
 
 class OggFLACFile(VCommentFile):
     """FLAC file."""
@@ -78,7 +78,7 @@ class OggFLACFile(VCommentFile):
     _File = mutagen.oggflac.OggFLAC
     def _info(self, file):
         super(OggFLACFile, self)._info(file)
-        self.metadata['~format'] = 'Ogg FLAC'
+        self.metadata['~format'] = self.NAME
 
 class OggSpeexFile(VCommentFile):
     """Ogg Speex file."""
@@ -87,7 +87,7 @@ class OggSpeexFile(VCommentFile):
     _File = mutagen.oggspeex.OggSpeex
     def _info(self, file):
         super(OggSpeexFile, self)._info(file)
-        self.metadata['~format'] = 'Ogg Speex'
+        self.metadata['~format'] = self.NAME
 
 class OggTheoraFile(VCommentFile):
     """Ogg Theora file."""
@@ -96,7 +96,7 @@ class OggTheoraFile(VCommentFile):
     _File = mutagen.oggtheora.OggTheora
     def _info(self, file):
         super(OggTheoraFile, self)._info(file)
-        self.metadata['~format'] = 'Ogg Theora'
+        self.metadata['~format'] = self.NAME
 
 class OggVorbisFile(VCommentFile):
     """Ogg Vorbis file."""
@@ -105,4 +105,4 @@ class OggVorbisFile(VCommentFile):
     _File = mutagen.oggvorbis.OggVorbis
     def _info(self, file):
         super(OggVorbisFile, self)._info(file)
-        self.metadata['~format'] = 'Ogg Vorbis'
+        self.metadata['~format'] = self.NAME