diff --git a/modules/Visualization/R/plot_extreme_probs.R b/modules/Visualization/R/plot_extreme_probs.R
index d0d38e5db3c25005c511e3f978982f8ef21ba447..39e7a7e54f1c355ecb6914a8ccca81c17cb89da0 100644
--- a/modules/Visualization/R/plot_extreme_probs.R
+++ b/modules/Visualization/R/plot_extreme_probs.R
@@ -176,7 +176,7 @@ plot_extreme_probs <- function(recipe, fcst,
                             "-", i_syear)
           # Mask
           if (!is.null(mask)) {
-            outfile <- paste0(outfile, "_enscormask")
+            outfile <- paste0(outfile, "_rpssmask")
             var_mask <- ClimProjDiags::Subset(mask,
                                               along = c("var"),
                                               indices = list(var),
@@ -189,7 +189,7 @@ plot_extreme_probs <- function(recipe, fcst,
           }
           # Dots
           if (!is.null(dots)) {
-            outfile <- paste0(outfile, "_enscordots")
+            outfile <- paste0(outfile, "_rpssdots")
             var_dots <- ClimProjDiags::Subset(dots,
                                               along = c("var"),
                                               indices = var,
diff --git a/modules/Visualization/Visualization.R b/modules/Visualization/Visualization.R
index 8c8ee629f002b73e75e7f8a310261c28f71a954b..398d8445b18cdaa922316034eb386a5317c5d598 100644
--- a/modules/Visualization/Visualization.R
+++ b/modules/Visualization/Visualization.R
@@ -143,7 +143,7 @@ Visualization <- function(recipe,
     }
   }
 
-  # Plot forecast ensemble mean
+  # Plot forecast map
   if ("forecast_map" %in% plots) {
     if (!is.null(data$fcst)) {
       if (is.null(recipe$Analysis$Workflow$Visualization$mask_ens)) {
@@ -173,11 +173,11 @@ Visualization <- function(recipe,
             c('both', TRUE)) {
           if (is.null(skill_metrics)) {
             error(recipe$Run$logger,
-                  paste0("For the forecast ensemble mean  plot, skill_metrics ",
+                  paste0("For the forecast map plot, skill_metrics ",
                          "needs to be provided to be masked."))
           } else if (!('enscorr' %in% names(skill_metrics))) {
             error(recipe$Run$logger,
-                  paste0("For the forecast ensemble mean plot, enscor metric ",
+                  paste0("For the forecast map plot, enscor metric ",
                          "needs to be provided to be masked."))
           } else {
             plot_forecast_map(recipe, data$fcst,
@@ -192,11 +192,11 @@ Visualization <- function(recipe,
         if (recipe$Analysis$Workflow$Visualization$dots %in% c('both', TRUE)) {
           if (is.null(skill_metrics)) {
             error(recipe$Run$logger,
-                  paste0("For the forecast ensemble mean plot, skill_metrics ",
+                  paste0("For the forecast map plot, skill_metrics ",
                          "needs to be provided for the dots."))
           } else if (!('enscorr' %in% names(skill_metrics))) {
             error(recipe$Run$logger,
-                  paste0("For the forecast ensemble mean plot, enscor metric ",
+                  paste0("For the forecast map plot, enscor metric ",
                          "needs to be provided for the dots."))
           } else {
             plot_forecast_map(recipe, data$fcst,
@@ -210,7 +210,7 @@ Visualization <- function(recipe,
       } ## End loop over methods
     } else {
       error(recipe$Run$logger,
-            paste0("The forecast ensemble mean plot has been requested, but ",
+            paste0("The forecast map plot has been requested, but ",
                    "there is no fcst element in 'data'."))
     }
   }
@@ -327,7 +327,7 @@ Visualization <- function(recipe,
         } else if (!('rpss' %in% names(skill_metrics))) {
           error(recipe$Run$logger,
                 paste0("For the extreme probabilities plot, rpss metric ",
-                       "need to be provided to be masked."))
+                       "needs to be provided to be masked."))
         } else {
           plot_extreme_probs(recipe = recipe, fcst = data$fcst,
                              probabilities = probabilities$fcst,