diff --git a/R/VizLayout.R b/R/VizLayout.R
index 1efe302bf7688830a977cdfbe2fe165bc0d6502c..28a8dbd105738ddba4ec8014c5af22e2f25ba3b7 100644
--- a/R/VizLayout.R
+++ b/R/VizLayout.R
@@ -555,7 +555,7 @@ VizLayout <- function(fun, plot_dims, data, ..., special_args = NULL,
   subtitle_margin <- 0.5 * sqrt(nrow * ncol) * subtitle_cex * subtitle_margin_scale
   mat_layout <- 1:(nrow * ncol)
   if (drawleg != FALSE) {
-    if (all(fun %in% 'PlotMostLikelyQuantileMap')) {  #multi_colorbar
+    if (all(fun %in% 'VizMostLikelyQuantileMap')) {  #multi_colorbar
       multi_colorbar <- TRUE
       cat_dim <- list(...)$cat_dim
       if (is.null(cat_dim)) cat_dim <- 'bin'  # default
@@ -724,20 +724,20 @@ VizLayout <- function(fun, plot_dims, data, ..., special_args = NULL,
       # For each of the arrays provided in that array
       apply(x, (1:length(dim(x)))[-plot_dim_indices], 
             function(y) {
-        # Do the plot. colorbar is not drew.
+        # Do the plot. colorbar is not drawn.
         fun_args <- c(list(y, toptitle = titles[plot_number], drawleg = FALSE), list(...),
                       special_args[[array_number]])
 #        funct <- fun[[array_number]]
-        if (fun[[array_number]] %in% c('PlotEquiMap', 'PlotStereoMap')) {
+        if (fun[[array_number]] %in% c('VizEquiMap', 'VizStereoMap')) {
           fun_args <- c(fun_args, list(brks = colorbar$brks, cols = colorbar$cols, 
                                        col_inf = colorbar$col_inf, 
                                        col_sup = colorbar$col_sup, 
                                        title_scale = subplot_titles_scale  # when all the functions have this argument, put it above in fun_args
                                        ))
-        } else if (fun[[array_number]] == c('PlotSection')) {
+        } else if (fun[[array_number]] == c('VizSection')) {
           fun_args <- c(fun_args, list(brks = colorbar$brks, cols = colorbar$cols))
 
-        } else if (fun[[array_number]] %in% 'PlotMostLikelyQuantileMap') {
+        } else if (fun[[array_number]] %in% 'VizMostLikelyQuantileMap') {
           #TODO: pre-generate colorbar params? like above
           fun_args <- c(fun_args, list(brks = brks, cols = cols))
         }