Index: /trunk/cd2flac
===================================================================
--- /trunk/cd2flac	(revision 16)
+++ /trunk/cd2flac	(revision 17)
@@ -173,5 +173,5 @@
 # copy to permanent location
 copy($flac_file, $archive_flac);
-system 'metaflac', '--set-tag', "MBZ_DISCID=$discid", $archive_flac;
+system 'metaflac', '--set-tag', "MUSICBRAINZ_DISCID=$discid", $archive_flac;
 print "Rip saved as $archive_flac\n";
 system 'eject', $CD_DEVICE;
Index: /trunk/flactrack
===================================================================
--- /trunk/flactrack	(revision 16)
+++ /trunk/flactrack	(revision 17)
@@ -48,6 +48,6 @@
     } else {
 
-        my $discid = $flac->tags('MBZ_DISCID') or warn "No MBZ_DISCID tag in $FLAC_FILE\n" if $flac;
-        #TODO: calculate TOC and DISCID from cuesheet if there is no MBZ_DISCID tag present
+        my $discid = $flac->tags('MUSICBRAINZ_DISCID') or warn "No MUSICBRAINZ_DISCID tag in $FLAC_FILE\n" if $flac;
+        #TODO: calculate TOC and DISCID from cuesheet if there is no MUSICBRAINZ_DISCID tag present
 
         $info = get_musicbrainz_info($discid);
Index: /trunk/lib/MusicBrainz.pm
===================================================================
--- /trunk/lib/MusicBrainz.pm	(revision 16)
+++ /trunk/lib/MusicBrainz.pm	(revision 17)
@@ -68,6 +68,4 @@
     my %info;
 
-    #TODO: deprecate the old MBZ tag name
-    $info{MBZ_DISCID} = $discid;
     $info{MUSICBRAINZ_DISCID} = $discid;
 
Index: /trunk/mbz
===================================================================
--- /trunk/mbz	(revision 16)
+++ /trunk/mbz	(revision 17)
@@ -21,5 +21,5 @@
     require Audio::FLAC::Header;
     my $flac = Audio::FLAC::Header->new($FLAC_FILE) or die "Can't read FLAC header from $FLAC_FILE\n";
-    $discid = $flac->tags('MBZ_DISCID') or die "No MBZ_DISCID tag in $FLAC_FILE\n";
+    $discid = $flac->tags('MUSICBRAINZ_DISCID') or die "No MUSICBRAINZ_DISCID tag in $FLAC_FILE\n";
 } else {
     $discid = shift;
Index: /trunk/mbz2id3
===================================================================
--- /trunk/mbz2id3	(revision 16)
+++ /trunk/mbz2id3	(revision 17)
@@ -200,5 +200,5 @@
 my $flac_file = shift;
 
-my $discid = `metaflac --show-tag MBZ_DISCID $flac_file | cut -d = -f 2`;
+my $discid = `metaflac --show-tag MUSICBRAINZ_DISCID $flac_file | cut -d = -f 2`;
 chomp $discid;