diff --git a/src/cats/environment/environment.c b/src/cats/environment/environment.c
index 290fe3d4869b91de360c74bb4d12786407535f22..6b44fecde2b8128428bd8c73b29d3b3020e7947c 100644
--- a/src/cats/environment/environment.c
+++ b/src/cats/environment/environment.c
@@ -70,8 +70,9 @@ void interpolate_environment(const struct cats_configuration *conf,
         const cats_dt_coord rows = environment->current.dimension.rows;
         const cats_dt_coord cols = environment->current.dimension.cols;
 
-        bool matching_dimensions = dimensions_match(&environment->start.dimension, &environment->end.dimension)
-                                   && dimensions_match(&environment->start.dimension, &environment->current.dimension);
+        bool matching_dimensions = cats_dimensions_match(&environment->start.dimension, &environment->end.dimension)
+                                   &&
+                                   cats_dimensions_match(&environment->start.dimension, &environment->current.dimension);
 
         if (!matching_dimensions) {
                 log_message(LOG_ERROR, "%s: dimension mismatch", __func__);
@@ -151,7 +152,7 @@ load_environment_raster(struct cats_configuration *conf, struct cats_environment
 
         unload_environment_raster(raster);
 
-        copy_dimensions_from_to(&conf->geometry.dimension, &raster->dimension);
+        copy_cats_dimensions(&conf->geometry.dimension, &raster->dimension);
 
         raster->interpolation_type = type;
         raster->environment_type = environment_type;
diff --git a/src/cats/environment/environment_rasters.c b/src/cats/environment/environment_rasters.c
index 7abcda86c2101615242c076cd44b3bef087e9cb9..2c2f9025798c1bdd8ac77b452bfe29a128ce36d6 100644
--- a/src/cats/environment/environment_rasters.c
+++ b/src/cats/environment/environment_rasters.c
@@ -55,7 +55,7 @@ void create_raster_if_needed(struct cats_configuration *conf, struct cats_enviro
         log_message(LOG_DEBUG, "%s: ALLOCATING NEW GRID NOW", __func__);
         raster->values = new_raw_2d_array_from_dimension(conf->geometry.dimension, sizeof(cats_dt_environment));
 
-        copy_dimensions_from_to(&conf->geometry.dimension, &raster->dimension);
+        copy_cats_dimensions(&conf->geometry.dimension, &raster->dimension);
 }
 
 
diff --git a/src/cats/grids/dimensions.c b/src/cats/grids/dimensions.c
index b0d24ec853bcf363a7a72738e69c4c15cf61adba..78f9dc6b1510f29877f762b6ef52b1fea2a1be89 100644
--- a/src/cats/grids/dimensions.c
+++ b/src/cats/grids/dimensions.c
@@ -1,17 +1,17 @@
 #include "dimensions.h"
 
 
-void copy_dimensions_from_to(const struct cats_dimension *from, struct cats_dimension *to)
+void copy_cats_dimensions(const struct cats_dimension *source, struct cats_dimension *destination)
 {
-        to->rows = from->rows;
-        to->cols = from->cols;
+        assert(source != NULL);
+        assert(destination != NULL);
+        destination->rows = source->rows;
+        destination->cols = source->cols;
 }
 
 
-bool dimensions_match(const struct cats_dimension *dim1, const struct cats_dimension *dim2)
+bool cats_dimensions_match(const struct cats_dimension *dim1, const struct cats_dimension *dim2)
 {
-        if (dim1->rows == dim2->rows && dim1->cols == dim2->cols) {
-                return true;
-        }
+        if (dim1->rows == dim2->rows && dim1->cols == dim2->cols) return true;
         return false;
 }
\ No newline at end of file
diff --git a/src/cats/grids/dimensions.h b/src/cats/grids/dimensions.h
index 064b644742842db90b7f50316bbc01081370778d..9b62aaf503b5a7ea5445cb12b185ab6a4414198e 100644
--- a/src/cats/grids/dimensions.h
+++ b/src/cats/grids/dimensions.h
@@ -8,17 +8,15 @@
 static inline bool valid_coordinates(const struct cats_dimension *dim, cats_dt_coord row, cats_dt_coord col)
 {
         assert(dim != NULL);
-        assert(row >= 0 && row < dim->rows);
-        assert(col >= 0 && col < dim->cols);
         if (row < 0 || col < 0) return false;
         if (row >= dim->rows || col >= dim->cols) return false;
         return true;
 }
 
 
-void copy_dimensions_from_to(const struct cats_dimension *from, struct cats_dimension *to);
+void copy_cats_dimensions(const struct cats_dimension *source, struct cats_dimension *destination);
 
-bool dimensions_match(const struct cats_dimension *dim1, const struct cats_dimension *dim2);
+bool cats_dimensions_match(const struct cats_dimension *dim1, const struct cats_dimension *dim2);
 
 bool valid_coordinates(const struct cats_dimension *dim, cats_dt_coord row, cats_dt_coord col);