diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
index e084fbebb5..b41aed2fce 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_csm2_mr.py
@@ -2,13 +2,10 @@
 from ..cmip5.bcc_csm1_1 import Tos as BaseTos
 from ..common import ClFixHybridPressureCoord
 
-
 Cl = ClFixHybridPressureCoord
 
-
 Cli = ClFixHybridPressureCoord
 
-
 Clw = ClFixHybridPressureCoord
 
 
@@ -66,3 +63,37 @@ def fix_metadata(self, cubes):
         lon_coord.units = '1'
         lon_coord.circular = False
         return cubes
+
+
+class Thetao(BaseTos):
+    """Fixes for thetao and so."""
+
+    def fix_metadata(self, cubes):
+        """Rename ``var_name`` of 1D-``latitude`` and 1D-``longitude``.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+
+        """
+        cube = self.get_cube_from_list(cubes)
+        lat_coord = cube.coord('latitude', dimensions=(2, ))
+        lon_coord = cube.coord('longitude', dimensions=(3, ))
+        lat_coord.standard_name = None
+        lat_coord.long_name = 'grid_latitude'
+        lat_coord.var_name = 'i'
+        lat_coord.units = '1'
+        lon_coord.standard_name = None
+        lon_coord.long_name = 'grid_longitude'
+        lon_coord.var_name = 'j'
+        lon_coord.units = '1'
+        lon_coord.circular = False
+        return cubes
+
+
+So = Thetao
diff --git a/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py b/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
index cae45b3f2f..abb0063a35 100644
--- a/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
+++ b/esmvalcore/cmor/_fixes/cmip6/bcc_esm1.py
@@ -1,15 +1,16 @@
 """Fixes for BCC-ESM1 model."""
 from ..common import ClFixHybridPressureCoord
 from .bcc_csm2_mr import Tos as BaseTos
-
+from .bcc_csm2_mr import Thetao as BaseThetao
 
 Cl = ClFixHybridPressureCoord
 
-
 Cli = ClFixHybridPressureCoord
 
-
 Clw = ClFixHybridPressureCoord
 
-
 Tos = BaseTos
+
+Thetao = BaseThetao
+
+So = BaseThetao