diff --git a/include/richdem/common/grid_cell.hpp b/include/richdem/common/grid_cell.hpp
index 924ebf8c..3aff1f44 100644
--- a/include/richdem/common/grid_cell.hpp
+++ b/include/richdem/common/grid_cell.hpp
@@ -21,7 +21,7 @@ struct GridCell {
   /// Initiate the grid cell without coordinates; should generally be avoided
   GridCell() = default;
   /// Initiate the grid cell to the coordinates (x0,y0)
-  GridCell(int x, int y):x(x),y(y){}
+  GridCell(int x0, int y0):x(x0),y(y0){}
   bool operator == (const GridCell &a) const {return x == a.x && y == a.y;}
 };
 
diff --git a/include/richdem/methods/upslope_cells.hpp b/include/richdem/methods/upslope_cells.hpp
index 2fae7f59..0fc58d18 100644
--- a/include/richdem/methods/upslope_cells.hpp
+++ b/include/richdem/methods/upslope_cells.hpp
@@ -1,5 +1,5 @@
-#ifndef _richdem_catchment_delineation_hpp_
-#define _richdem_catchment_delineation_hpp_
+#ifndef _richdem_upslope_cells_hpp_
+#define _richdem_upslope_cells_hpp_
 
 #include <richdem/common/Array2D.hpp>
 #include <richdem/common/Array3D.hpp>
@@ -26,4 +26,4 @@ template<                            class result_t> void UC_line_props(int x0,
 template<              class elev_t, class result_t> void UC_line_mflow(int x0, int y0, int x1, int y1, const Array2D<elev_t> &elev, Array2D<result_t> &upslope){init(upslope,elev,0);  std::queue<GridCell> expansion = queue_from_linepoints(x0,y0,x1,y1,upslope); upslope_cells_mflow<Topology::D8>(expansion, elev,  upslope);}
 
 }
-#endif
\ No newline at end of file
+#endif //_richdem_upslope_cells_
\ No newline at end of file
diff --git a/include/richdem/methods/upslope_cells_functions.hpp b/include/richdem/methods/upslope_cells_functions.hpp
index afdea196..cb8a1ac8 100644
--- a/include/richdem/methods/upslope_cells_functions.hpp
+++ b/include/richdem/methods/upslope_cells_functions.hpp
@@ -1,5 +1,5 @@
-#ifndef _richdem_catchment_delineation_generic_hpp_
-#define _richdem_catchment_delineation_generic_hpp_
+#ifndef _richdem_upslope_cells_functions_hpp_
+#define _richdem_upslope_cells_functions_hpp_
 
 #include <richdem/common/Array2D.hpp>
 #include <richdem/common/Array3D.hpp>