diff --git a/raster/r.random.cells/init.c b/raster/r.random.cells/init.c
index 1f6ec1c7737..4cb49ce9a99 100644
--- a/raster/r.random.cells/init.c
+++ b/raster/r.random.cells/init.c
@@ -42,8 +42,10 @@ void Init(void)
 
     Cells = FlagCreate(Rs, Cs);
     CellCount = 0;
-    if (G_find_raster2("MASK", G_mapset())) {
-        FD = Rast_open_old("MASK", G_mapset());
+    char mask_name[GNAME_MAX];
+    char mask_mapset[GMAPSET_MAX];
+    if (Rast_mask_status(mask_name, mask_mapset, NULL, NULL, NULL)) {
+        FD = Rast_open_old(mask_name, mask_mapset);
         {
             for (row = 0; row < Rs; row++) {
                 Rast_get_c_row_nomask(FD, CellBuffer, row);
diff --git a/raster/r.random.surface/init.c b/raster/r.random.surface/init.c
index a2b4af5dc8b..44d79fd2bf8 100644
--- a/raster/r.random.surface/init.c
+++ b/raster/r.random.surface/init.c
@@ -35,12 +35,10 @@ void Init(void)
     else
         MinRes = NS;
 
-    if (NULL == G_find_file("cell", "MASK", G_mapset())) {
-        MapCount = Rs * Cs;
-        FDM = -1;
-    }
-    else {
-        FDM = Rast_open_old("MASK", G_mapset());
+    char mask_name[GNAME_MAX];
+    char mask_mapset[GMAPSET_MAX];
+    if (Rast_mask_status(mask_name, mask_mapset, NULL, NULL, NULL)) {
+        FDM = Rast_open_old(mask_name, mask_mapset);
         {
             MapCount = 0;
             CellBuffer = Rast_allocate_c_buf();
@@ -53,6 +51,10 @@ void Init(void)
             }
         }
     }
+    else {
+        MapCount = Rs * Cs;
+        FDM = -1;
+    }
 
     if (Uniform->answer)
         sprintf(Buf, "Uni. R. S.");
diff --git a/raster/r.surf.contour/main.c b/raster/r.surf.contour/main.c
index 4c28d848822..202cc99e758 100644
--- a/raster/r.surf.contour/main.c
+++ b/raster/r.surf.contour/main.c
@@ -80,8 +80,10 @@ int main(int argc, char *argv[])
     alt_row = (DCELL *)G_malloc(ncols * sizeof(DCELL));
     seen = flag_create(nrows, ncols);
     mask = flag_create(nrows, ncols);
-    if (NULL != G_find_file("cell", "MASK", G_mapset())) {
-        file_fd = Rast_open_old("MASK", G_mapset());
+    char mask_name[GNAME_MAX];
+    char mask_mapset[GMAPSET_MAX];
+    if (Rast_mask_status(mask_name, mask_mapset, NULL, NULL, NULL)) {
+        file_fd = Rast_open_old(mask_name, mask_mapset);
         for (r = 0; r < nrows; r++) {
             Rast_get_d_row_nomask(file_fd, alt_row, r);
             for (c = 0; c < ncols; c++)