diff --git a/earthdiagnostics/frequency.py b/earthdiagnostics/frequency.py
index 9134352a51ce8c325eea9af0946cca82f4812001..2bf566c6a274de7b62d7a7ea4ce988f6b4706188 100644
--- a/earthdiagnostics/frequency.py
+++ b/earthdiagnostics/frequency.py
@@ -17,10 +17,10 @@ class Frequency(object):
         "monc": "clim",
         "dec": "dec",
         "decadal": "dec",
-        "y": "year",
-        "yr": "year",
-        "year": "year",
-        "yearly": "year",
+        "y": "yr",
+        "yr": "yr",
+        "year": "yr",
+        "yearly": "yr",
         "m": "mon",
         "1m": "mon",
         "mon": "mon",
diff --git a/test/unit/test_modelling_realm.py b/test/unit/test_modelling_realm.py
index ca2dd872a28ca2c0168911d453a50fe6953c4bf5..72c43fb2fddbb0dabcf2d07b8798e9b56aef3d54 100644
--- a/test/unit/test_modelling_realm.py
+++ b/test/unit/test_modelling_realm.py
@@ -40,7 +40,17 @@ class TestModellingRealm(TestCase):
 
     def test_get_omon(self):
         self.assertEqual(
-            self.realm.get_table_name(Frequencies.monthly, "specs"), "Omon"
+            self.realm.get_table_name(
+                Frequencies.monthly, self.data_convention),
+            "Omon"
+        )
+
+    def test_get_oyr(self):
+        self.data_convention.name = 'cmip6'
+        self.assertEqual(
+            self.realm.get_table_name(
+                Frequencies.yearly, self.data_convention),
+            "Oyr"
         )
 
     def test_get_oimon(self):