diff --git a/definitions/mars/grib.efra.fc.def b/definitions/mars/grib.efcl.cf.def
similarity index 89%
rename from definitions/mars/grib.efra.fc.def
rename to definitions/mars/grib.efcl.cf.def
index 035b08651..e778f44e0 100644
--- a/definitions/mars/grib.efra.fc.def
+++ b/definitions/mars/grib.efcl.cf.def
@@ -1,4 +1,4 @@
-# EFRA forecast
+# EFAS climatology control forecast
 alias mars.origin = inputOriginatingCentre;
 
 # We need this because 'efas_post_proc' is defined later
diff --git a/definitions/mars/grib.efra.cf.def b/definitions/mars/grib.efcl.fc.def
similarity index 91%
rename from definitions/mars/grib.efra.cf.def
rename to definitions/mars/grib.efcl.fc.def
index ada4b698e..f28537e65 100644
--- a/definitions/mars/grib.efra.cf.def
+++ b/definitions/mars/grib.efcl.fc.def
@@ -1,4 +1,4 @@
-# EFRA control forecast
+# EFAS climatology forecast
 alias mars.origin = inputOriginatingCentre;
 
 # We need this because 'efas_post_proc' is defined later
diff --git a/definitions/mars/grib.efra.go.def b/definitions/mars/grib.efcl.go.def
similarity index 89%
rename from definitions/mars/grib.efra.go.def
rename to definitions/mars/grib.efcl.go.def
index 89fad9a2d..e74db87c6 100644
--- a/definitions/mars/grib.efra.go.def
+++ b/definitions/mars/grib.efcl.go.def
@@ -1,4 +1,4 @@
-# EFRA Gridded observations
+# EFAS climatology Gridded observations
 
 # ECC-701
 alias mars.step = endStep;
diff --git a/definitions/mars/grib.efcl.pf.def b/definitions/mars/grib.efcl.pf.def
new file mode 100644
index 000000000..7f148c457
--- /dev/null
+++ b/definitions/mars/grib.efcl.pf.def
@@ -0,0 +1,13 @@
+# EFAS climatology perturbed forecast
+
+alias mars.origin = inputOriginatingCentre;
+
+alias mars.number = perturbationNumber;
+
+# We need this because 'efas_post_proc' is defined later
+meta efas_model sprintf("%s", efas_post_proc) : no_copy;
+alias mars.model = efas_model;
+
+alias mars.date  = dateOfReanalysis;
+alias mars.time  = timeOfReanalysis;
+alias mars.hdate = dataDate;
diff --git a/definitions/mars/grib.efra.sfo.def b/definitions/mars/grib.efcl.sfo.def
similarity index 86%
rename from definitions/mars/grib.efra.sfo.def
rename to definitions/mars/grib.efcl.sfo.def
index 83da66f54..7d99a817f 100644
--- a/definitions/mars/grib.efra.sfo.def
+++ b/definitions/mars/grib.efcl.sfo.def
@@ -1,4 +1,4 @@
-# EFRA simulation forced with observations
+# EFAS climatology simulation forced with observations
 # Water Balance
 
 # ECC-701
diff --git a/definitions/mars/grib.efra.pf.def b/definitions/mars/grib.efra.pf.def
deleted file mode 100644
index aa3db6cf4..000000000
--- a/definitions/mars/grib.efra.pf.def
+++ /dev/null
@@ -1,13 +0,0 @@
-# EFRA perturbed forecast
-#meta efas_suite_name sprintf("%s_%s_%s", inputOriginatingCentre, efas_forecast, efas_post_proc) : no_copy;
-alias mars.origin = inputOriginatingCentre;
-
-alias mars.number = perturbationNumber;
-
-# We need this because 'efas_post_proc' is defined later
-meta efas_model sprintf("%s", efas_post_proc) : no_copy;
-alias mars.model = efas_model;
-
-alias mars.date  = dateOfReanalysis;
-alias mars.time  = timeOfReanalysis;
-alias mars.hdate = dataDate;
diff --git a/definitions/mars/stream.table b/definitions/mars/stream.table
index e44e6fc75..678218e08 100644
--- a/definitions/mars/stream.table
+++ b/definitions/mars/stream.table
@@ -33,7 +33,7 @@
 1056 ammc Melbourne
 1057 efas European Flood Awareness System (EFAS)
 1058 efse European Flood Awareness System (EFAS) seasonal forecasts
-1059 efra European Flood Awareness System (EFAS) reanalysis
+1059 efcl European Flood Awareness System (EFAS) climatology
 1060 wfas Global flood awareness system
 1070 msdc Monthly standard deviation and covariance
 1071 moda Monthly means of daily means
diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh
index 1356ed677..7ed77d795 100755
--- a/tests/grib_efas.sh
+++ b/tests/grib_efas.sh
@@ -86,9 +86,9 @@ for t in $types; do
 done
 
 # ---------------------------
-# Stream EFRA
+# Stream EFCL (Climatology)
 # ---------------------------
-${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,stream=efra,type=fc $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample
+${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,stream=efcl,type=fc $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample
 
 # Test a non-ensemble, instantaneous field
 ${tools_dir}/grib_set -s productDefinitionTemplateNumber=70,typeOfPostProcessing=1 $sample $temp1
@@ -97,7 +97,7 @@ ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,yearOfRea
 grib_check_key_equals $temp2 mars.hdate,mars.date '20070323 20191213'
 # This stream does not have the 'anoffset' key
 anoffset=`${tools_dir}/grib_get -f -p mars.anoffset $temp2`
-[ "anoffset" = "not_found" ]
+[ "$anoffset" = "not_found" ]
 
 
 # Clean up