diff --git a/picard/mbjson.py b/picard/mbjson.py
index 43b45e8ee..56ae1ab9c 100644
--- a/picard/mbjson.py
+++ b/picard/mbjson.py
@@ -73,7 +73,7 @@ _MEDIUM_TO_METADATA = {
 
 _RECORDING_TO_METADATA = {
     'disambiguation': '~recordingcomment',
-    'first-release-date': '~recordingoriginaldate',
+    'first-release-date': '~recording_firstreleasedate',
     'title': 'title',
 }
 
@@ -94,7 +94,7 @@ _ARTIST_TO_METADATA = {
 
 _RELEASE_GROUP_TO_METADATA = {
     'disambiguation': '~releasegroupcomment',
-    'first-release-date': '~releaseoriginaldate',
+    'first-release-date': '~releasegroup_firstreleasedate',
     'title': '~releasegroup',
 }
 
@@ -495,8 +495,8 @@ def release_group_to_metadata(node, m, release_group=None):
         elif key == 'secondary-types':
             add_secondary_release_types(value, m)
     add_genres_from_node(node, release_group)
-    if m['~releaseoriginaldate']:
-        m['originaldate'] = m['~releaseoriginaldate']
+    if m['~releasegroup_firstreleasedate']:
+        m['originaldate'] = m['~releasegroup_firstreleasedate']
         m['originalyear'] = m['originaldate'][:4]
     m['releasetype'] = m.getall('~primaryreleasetype') + m.getall('~secondaryreleasetype')
 
diff --git a/picard/track.py b/picard/track.py
index 5e990d7b6..f06c65151 100644
--- a/picard/track.py
+++ b/picard/track.py
@@ -427,8 +427,8 @@ class NonAlbumTrack(Track):
     def _customize_metadata(self):
         super()._customize_metadata()
         self.metadata['album'] = self.album.metadata['album']
-        if self.metadata['~recordingoriginaldate']:
-            self.metadata['originaldate'] = self.metadata['~recordingoriginaldate']
+        if self.metadata['~recording_firstreleasedate']:
+            self.metadata['originaldate'] = self.metadata['~recording_firstreleasedate']
             self.metadata['originalyear'] = self.metadata['originaldate'][:4]
 
     def run_when_loaded(self, func):
diff --git a/test/test_mbjson.py b/test/test_mbjson.py
index e3dc53adf..b79851b2d 100644
--- a/test/test_mbjson.py
+++ b/test/test_mbjson.py
@@ -190,7 +190,7 @@ class RecordingTest(MBJSONTest):
         self.assertEqual(m['~artists_sort'], 'Sheeran, Ed')
         self.assertEqual(m['~length'], '4:41')
         self.assertEqual(m['~recordingtitle'], 'Thinking Out Loud')
-        self.assertEqual(m['~recordingoriginaldate'], '2014-06-20')
+        self.assertEqual(m['~recording_firstreleasedate'], '2014-06-20')
         self.assertNotIn('originaldate', m)
         self.assertNotIn('originalyear', m)
         self.assertEqual(t.genres, {
@@ -360,7 +360,7 @@ class ReleaseGroupTest(MBJSONTest):
         r = ReleaseGroup("1")
         release_group_to_metadata(self.json_doc, m, r)
         self.assertEqual(m['musicbrainz_releasegroupid'], 'f5093c06-23e3-404f-aeaa-40f72885ee3a')
-        self.assertEqual(m['~releaseoriginaldate'], '1973-03-24')
+        self.assertEqual(m['~releasegroup_firstreleasedate'], '1973-03-24')
         self.assertEqual(m['originaldate'], '1973-03-24')
         self.assertEqual(m['originalyear'], '1973')
         self.assertEqual(m['releasetype'], 'album')