diff --git a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp
index 769aa0318dd..1719aea17e9 100644
--- a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp
+++ b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp
@@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "cpp_common/pgr_base_graph.hpp"
 #include "cpp_common/interruption.h"
+#include "c_types/mst_rt.h"
+
 //******************************************
 
 namespace pgrouting {
@@ -46,11 +48,11 @@ class Pgr_breadthFirstSearch {
     typedef typename G::B_G B_G;
 
 
-    std::vector<pgr_mst_rt> breadthFirstSearch(
+    std::vector<MST_rt> breadthFirstSearch(
         G &graph,
         std::vector<int64_t> start_vertex,
         int64_t depth) {
-        std::vector<pgr_mst_rt> results;
+        std::vector<MST_rt> results;
         using bfs_visitor = visitors::Edges_order_bfs_visitor<E>;
 
         for (auto source : start_vertex) {
@@ -74,12 +76,12 @@ class Pgr_breadthFirstSearch {
 
  private:
      template <typename T>
-     std::vector<pgr_mst_rt> get_results(
+     std::vector<MST_rt> get_results(
              T order,
              int64_t source,
              int64_t max_depth,
              const G &graph) {
-         std::vector<pgr_mst_rt> results;
+         std::vector<MST_rt> results;
 
          std::vector<double> agg_cost(graph.num_vertices(), 0);
          std::vector<int64_t> depth(graph.num_vertices(), 0);
diff --git a/include/c_types/pgr_mst_rt.h b/include/c_types/mst_rt.h
similarity index 87%
rename from include/c_types/pgr_mst_rt.h
rename to include/c_types/mst_rt.h
index dfc3f004754..ac4cf3536f2 100644
--- a/include/c_types/pgr_mst_rt.h
+++ b/include/c_types/mst_rt.h
@@ -1,5 +1,5 @@
 /*PGR-GNU*****************************************************************
-File: pgr_kruskal_t.h
+File: mst_rt.h
 
 Copyright (c) 2015 Aditya Pratap Singh
 Mail: adityapratap.singh28@gmail.com
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 /*! @file */
 
-#ifndef INCLUDE_C_TYPES_PGR_MST_RT_H_
-#define INCLUDE_C_TYPES_PGR_MST_RT_H_
+#ifndef INCLUDE_C_TYPES_MST_RT_H_
+#define INCLUDE_C_TYPES_MST_RT_H_
 #pragma once
 
 /* for int64_t */
@@ -33,13 +33,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #   include <stdint.h>
 #endif
 
-typedef struct {
+struct MST_rt {
     int64_t from_v;
     int64_t depth;
     int64_t node;
     int64_t edge;
     double cost;
     double agg_cost;
-} pgr_mst_rt;
+};
 
-#endif  // INCLUDE_C_TYPES_PGR_MST_RT_H_
+#endif  // INCLUDE_C_TYPES_MST_RT_H_
diff --git a/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h b/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h
index 438e406bc71..54fe156b399 100644
--- a/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h
+++ b/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h
@@ -34,12 +34,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 /* for size-t */
 #ifdef __cplusplus
 #   include <cstddef>
+#   include <cstdint>
 #else
 #   include <stddef.h>
+#   include <stdint.h>
 #endif
 
 typedef struct Edge_t Edge_t;
-#include "c_types/pgr_mst_rt.h"
+typedef struct MST_rt MST_rt;
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,7 +62,7 @@ extern "C" {
                 size_t size_start_vidsArr,
                 int64_t max_depth,
                 bool directed,
-                pgr_mst_rt **return_tuples,
+                MST_rt **return_tuples,
                 size_t *return_count,
                 char ** log_msg,
                 char ** notice_msg,
diff --git a/include/drivers/components/makeConnected_driver.h b/include/drivers/components/makeConnected_driver.h
index 2b95219eacb..aa5b89ca740 100644
--- a/include/drivers/components/makeConnected_driver.h
+++ b/include/drivers/components/makeConnected_driver.h
@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #endif
 
 typedef struct Edge_t Edge_t;
-#include "c_types/pgr_mst_rt.h"
-
 typedef struct pgr_makeConnected_t pgr_makeConnected_t;
 
 #ifdef __cplusplus
diff --git a/include/drivers/planar/boyerMyrvold_driver.h b/include/drivers/planar/boyerMyrvold_driver.h
index 087232a3532..17ebee75234 100644
--- a/include/drivers/planar/boyerMyrvold_driver.h
+++ b/include/drivers/planar/boyerMyrvold_driver.h
@@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 typedef struct Edge_t Edge_t;
 #include "c_types/pgr_boyer_t.h"
-#include "c_types/pgr_mst_rt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/drivers/planar/isPlanar_driver.h b/include/drivers/planar/isPlanar_driver.h
index d52e150a730..4fd9a1b3b91 100644
--- a/include/drivers/planar/isPlanar_driver.h
+++ b/include/drivers/planar/isPlanar_driver.h
@@ -40,7 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 typedef struct Edge_t Edge_t;
 #include "c_types/pgr_boyer_t.h"
-#include "c_types/pgr_mst_rt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/drivers/spanningTree/kruskal_driver.h b/include/drivers/spanningTree/kruskal_driver.h
index 055f07a16bf..116f006bbe7 100644
--- a/include/drivers/spanningTree/kruskal_driver.h
+++ b/include/drivers/spanningTree/kruskal_driver.h
@@ -34,12 +34,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 /* for size-t */
 #ifdef __cplusplus
 #   include <cstddef>
+#   include <cstdint>
 #else
 #   include <stddef.h>
+#   include <stdint.h>
 #endif
 
 typedef struct Edge_t Edge_t;
-#include "c_types/pgr_mst_rt.h"
+typedef struct MST_rt MST_rt;
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,7 +60,7 @@ extern "C" {
                 int64_t max_depth,
                 double distance,
 
-                pgr_mst_rt **return_tuples,
+                MST_rt **return_tuples,
                 size_t *return_count,
                 char ** log_msg,
                 char ** notice_msg,
diff --git a/include/drivers/spanningTree/prim_driver.h b/include/drivers/spanningTree/prim_driver.h
index c7a115011e6..a7e24eed2ac 100644
--- a/include/drivers/spanningTree/prim_driver.h
+++ b/include/drivers/spanningTree/prim_driver.h
@@ -34,12 +34,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 /* for size-t */
 #ifdef __cplusplus
 #   include <cstddef>
+#   include <cstdint>
 #else
 #   include <stddef.h>
+#   include <stdint.h>
 #endif
 
 typedef struct Edge_t Edge_t;
-#include "c_types/pgr_mst_rt.h"
+typedef struct MST_rt MST_rt;
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,7 +59,7 @@ void do_pgr_prim(
         int64_t max_depth,
         double distance,
 
-        pgr_mst_rt **return_tuples,
+        MST_rt **return_tuples,
         size_t *return_count,
 
         char ** log_msg,
diff --git a/include/drivers/traversal/depthFirstSearch_driver.h b/include/drivers/traversal/depthFirstSearch_driver.h
index d562c38e09d..a7069c26792 100644
--- a/include/drivers/traversal/depthFirstSearch_driver.h
+++ b/include/drivers/traversal/depthFirstSearch_driver.h
@@ -34,12 +34,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 /* for size-t */
 #ifdef __cplusplus
 #   include <cstddef>
+#   include <cstdint>
 #else
 #   include <stddef.h>
+#   include <stdint.h>
 #endif
 
 typedef struct Edge_t Edge_t;
-#include "c_types/pgr_mst_rt.h"
+typedef struct MST_rt MST_rt;
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,7 +67,7 @@ extern "C" {
             bool directed,
             int64_t max_depth,
 
-            pgr_mst_rt **return_tuples,
+            MST_rt **return_tuples,
             size_t *return_count,
 
             char ** log_msg,
diff --git a/include/spanningTree/details.hpp b/include/spanningTree/details.hpp
index e540cbce4cb..5027cea4bc0 100644
--- a/include/spanningTree/details.hpp
+++ b/include/spanningTree/details.hpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #pragma once
 
 #include <vector>
-#include "c_types/pgr_mst_rt.h"
+#include "c_types/mst_rt.h"
 
 namespace pgrouting {
 
@@ -36,7 +36,7 @@ namespace details {
 std::vector<int64_t>
 clean_vids(std::vector<int64_t> vids);
 
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 get_no_edge_graph_result(
         std::vector<int64_t> vids);
 
diff --git a/include/spanningTree/pgr_kruskal.hpp b/include/spanningTree/pgr_kruskal.hpp
index 9d4d265123f..908327de5f9 100644
--- a/include/spanningTree/pgr_kruskal.hpp
+++ b/include/spanningTree/pgr_kruskal.hpp
@@ -40,19 +40,19 @@ namespace functions {
 template <class G>
 class Pgr_kruskal : public Pgr_mst<G> {
  public:
-     std::vector<pgr_mst_rt> kruskal(G &graph);
+     std::vector<MST_rt> kruskal(G &graph);
 
-     std::vector<pgr_mst_rt> kruskalBFS(
+     std::vector<MST_rt> kruskalBFS(
              G &graph,
              std::vector<int64_t> roots,
              int64_t max_depth);
 
-     std::vector<pgr_mst_rt> kruskalDFS(
+     std::vector<MST_rt> kruskalDFS(
              G &graph,
              std::vector<int64_t> roots,
              int64_t max_depth);
 
-     std::vector<pgr_mst_rt> kruskalDD(
+     std::vector<MST_rt> kruskalDD(
              G &graph,
              std::vector<int64_t> roots,
              double distance);
@@ -81,7 +81,7 @@ Pgr_kruskal<G>::generate_mst(const G &graph) {
 
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_kruskal<G>::kruskal(
         G &graph) {
     return this->mst(graph);
@@ -89,7 +89,7 @@ Pgr_kruskal<G>::kruskal(
 
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_kruskal<G>::kruskalBFS(
         G &graph,
         std::vector<int64_t> roots,
@@ -98,7 +98,7 @@ Pgr_kruskal<G>::kruskalBFS(
 }
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_kruskal<G>::kruskalDFS(
         G &graph,
         std::vector<int64_t> roots,
@@ -107,7 +107,7 @@ Pgr_kruskal<G>::kruskalDFS(
 }
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_kruskal<G>::kruskalDD(
         G &graph,
         std::vector<int64_t> roots,
diff --git a/include/spanningTree/pgr_mst.hpp b/include/spanningTree/pgr_mst.hpp
index 5ff271d46aa..49331459850 100644
--- a/include/spanningTree/pgr_mst.hpp
+++ b/include/spanningTree/pgr_mst.hpp
@@ -62,22 +62,22 @@ class Pgr_mst {
          this->m_tree_id.clear();
      }
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
      no_order(const G &graph) {
          return no_ordering(graph);
      }
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
      dfs_order(const G &graph) {
          return dfs_ordering(graph);
      }
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
      bfs_order(const G &graph) {
          return bfs_ordering(graph);
      }
 
-     std::vector<pgr_mst_rt> mst(const G &graph) {
+     std::vector<MST_rt> mst(const G &graph) {
          m_suffix = "";
          m_get_component = false;
          m_distance = -1;
@@ -90,7 +90,7 @@ class Pgr_mst {
      }
 
 
-     std::vector<pgr_mst_rt> mstBFS(
+     std::vector<MST_rt> mstBFS(
              const G &graph,
              std::vector<int64_t> roots,
              int64_t max_depth) {
@@ -104,7 +104,7 @@ class Pgr_mst {
          return bfs_order(graph);
      }
 
-     std::vector<pgr_mst_rt> mstDFS(
+     std::vector<MST_rt> mstDFS(
              const G &graph,
              std::vector<int64_t> roots,
              int64_t max_depth) {
@@ -118,7 +118,7 @@ class Pgr_mst {
          return dfs_order(graph);
      }
 
-     std::vector<pgr_mst_rt> mstDD(
+     std::vector<MST_rt> mstDD(
              const G &graph,
              std::vector<int64_t> roots,
              double distance) {
@@ -167,11 +167,11 @@ class Pgr_mst {
 
  private:
      template <typename T>
-     std::vector<pgr_mst_rt> get_results(
+     std::vector<MST_rt> get_results(
              T order,
              int64_t p_root,
              const G &graph) {
-         std::vector<pgr_mst_rt> results;
+         std::vector<MST_rt> results;
 
          std::vector<double> agg_cost(graph.num_vertices(), 0);
          std::vector<int64_t> depth(graph.num_vertices(), 0);
@@ -246,12 +246,12 @@ class Pgr_mst {
          }
      }
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
          no_ordering(const G &graph) {
              return get_results(m_spanning_tree.edges, 0, graph);
          }
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
          dfs_forest(const G &graph) {
              boost::filtered_graph<B_G, InSpanning, boost::keep_all>
                  mstGraph(graph.graph, m_spanning_tree, {});
@@ -276,7 +276,7 @@ class Pgr_mst {
          }
 
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
          dfs_ordering(const G &graph) {
              boost::filtered_graph<B_G, InSpanning, boost::keep_all>
                  mstGraph(graph.graph, m_spanning_tree, {});
@@ -284,7 +284,7 @@ class Pgr_mst {
              if (m_roots.empty()) {
                  return dfs_forest(graph);
              } else {
-                 std::vector<pgr_mst_rt> results;
+                 std::vector<MST_rt> results;
                  for (const auto root : m_roots) {
                      std::vector<E> visited_order;
 
@@ -318,9 +318,9 @@ class Pgr_mst {
              }
          }
 
-     std::vector<pgr_mst_rt>
+     std::vector<MST_rt>
      bfs_ordering(const G &graph) {
-         std::vector<pgr_mst_rt> results;
+         std::vector<MST_rt> results;
          /*
           * order by bfs
           */
diff --git a/include/spanningTree/pgr_prim.hpp b/include/spanningTree/pgr_prim.hpp
index 67fcabddfb6..d3334ec870c 100644
--- a/include/spanningTree/pgr_prim.hpp
+++ b/include/spanningTree/pgr_prim.hpp
@@ -50,19 +50,19 @@ class Pgr_prim : public Pgr_mst<G> {
      typedef typename G::B_G B_G;
 
  public:
-     std::vector<pgr_mst_rt> prim(G &graph);
+     std::vector<MST_rt> prim(G &graph);
 
-     std::vector<pgr_mst_rt> primBFS(
+     std::vector<MST_rt> primBFS(
              G &graph,
              std::vector<int64_t> roots,
              int64_t max_depth);
 
-     std::vector<pgr_mst_rt> primDFS(
+     std::vector<MST_rt> primDFS(
              G &graph,
              std::vector<int64_t> roots,
              int64_t max_depth);
 
-     std::vector<pgr_mst_rt> primDD(
+     std::vector<MST_rt> primDD(
              G &graph,
              std::vector<int64_t> roots,
              double distance);
@@ -161,14 +161,14 @@ Pgr_prim<G>::generate_mst(const G &graph) {
 }
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_prim<G>::prim(
         G &graph) {
     return this->mst(graph);
 }
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_prim<G>::primBFS(
         G &graph,
         std::vector<int64_t> roots,
@@ -177,7 +177,7 @@ Pgr_prim<G>::primBFS(
 }
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_prim<G>::primDFS(
         G &graph,
         std::vector<int64_t> roots,
@@ -186,7 +186,7 @@ Pgr_prim<G>::primDFS(
 }
 
 template <class G>
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 Pgr_prim<G>::primDD(
         G &graph,
         std::vector<int64_t> roots,
diff --git a/include/traversal/pgr_depthFirstSearch.hpp b/include/traversal/pgr_depthFirstSearch.hpp
index 96d3a963f26..5fbd404e773 100644
--- a/include/traversal/pgr_depthFirstSearch.hpp
+++ b/include/traversal/pgr_depthFirstSearch.hpp
@@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "cpp_common/pgr_base_graph.hpp"
 #include "cpp_common/interruption.h"
+#include "c_types/mst_rt.h"
 
 
 /** @file pgr_depthFirstSearch.hpp
@@ -77,12 +78,12 @@ class Pgr_depthFirstSearch {
       * @see [boost::undirected_dfs]
       * (https://www.boost.org/libs/graph/doc/undirected_dfs.html)
       */
-     std::vector < pgr_mst_rt > depthFirstSearch(
+     std::vector < MST_rt > depthFirstSearch(
              G &graph,
              std::vector < int64_t > roots,
              bool directed,
              int64_t max_depth) {
-         std::vector < pgr_mst_rt > results;
+         std::vector < MST_rt > results;
 
          for (auto root : roots) {
              std::vector < E > visited_order;
@@ -176,12 +177,12 @@ class Pgr_depthFirstSearch {
       * @returns `results` vector
       */
      template < typename T >
-     std::vector < pgr_mst_rt > get_results(
+     std::vector < MST_rt > get_results(
              T visited_order,
              int64_t root,
              int64_t max_depth,
              const G &graph) {
-         std::vector < pgr_mst_rt > results;
+         std::vector < MST_rt > results;
 
          std::vector < double > agg_cost(graph.num_vertices(), 0);
          std::vector < int64_t > depth(graph.num_vertices(), 0);
diff --git a/src/breadthFirstSearch/breadthFirstSearch.c b/src/breadthFirstSearch/breadthFirstSearch.c
index 236e1006c19..fd7c2c34c8a 100644
--- a/src/breadthFirstSearch/breadthFirstSearch.c
+++ b/src/breadthFirstSearch/breadthFirstSearch.c
@@ -39,6 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/edges_input.h"
 #include "c_common/arrays_input.h"
 
+#include "c_types/mst_rt.h"
+
 #include "drivers/breadthFirstSearch/breadthFirstSearch_driver.h"
 
 PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS);
@@ -51,7 +53,7 @@ process(
     int64_t max_depth,
     bool directed,
 
-    pgr_mst_rt **result_tuples,
+    MST_rt **result_tuples,
     size_t *result_count) {
     pgr_SPI_connect();
 
@@ -128,7 +130,7 @@ PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS) {
     TupleDesc tuple_desc;
 
     /**************************************************************************/
-    pgr_mst_rt *result_tuples = NULL;
+    MST_rt *result_tuples = NULL;
     size_t result_count = 0;
     /**************************************************************************/
 
@@ -174,7 +176,7 @@ PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS) {
 
     funcctx = SRF_PERCALL_SETUP();
     tuple_desc = funcctx->tuple_desc;
-    result_tuples = (pgr_mst_rt *)funcctx->user_fctx;
+    result_tuples = (MST_rt *)funcctx->user_fctx;
 
     if (funcctx->call_cntr < funcctx->max_calls) {
         HeapTuple tuple;
diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp
index 4266cda6bc7..235ed24dcd2 100644
--- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp
+++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "breadthFirstSearch/pgr_breadthFirstSearch.hpp"
 
 template < class G >
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 pgr_breadthFirstSearch(
         G &graph,
         std::vector < int64_t > sources,
@@ -65,7 +65,7 @@ do_pgr_breadthFirstSearch(
                 int64_t  max_depth,
                 bool directed,
 
-                pgr_mst_rt **return_tuples,
+                MST_rt **return_tuples,
                 size_t *return_count,
                 char ** log_msg,
                 char ** notice_msg,
@@ -87,7 +87,7 @@ do_pgr_breadthFirstSearch(
         std::vector<int64_t>
             start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr);
 
-        std::vector<pgr_mst_rt> results;
+        std::vector<MST_rt> results;
         if (directed) {
             log << "Working with directed Graph\n";
             pgrouting::DirectedGraph digraph(gType);
diff --git a/src/spanningTree/details.cpp b/src/spanningTree/details.cpp
index 5ed8086c9de..dd824a5be8d 100644
--- a/src/spanningTree/details.cpp
+++ b/src/spanningTree/details.cpp
@@ -41,10 +41,10 @@ clean_vids(std::vector<int64_t> vids) {
     return vids;
 }
 
-std::vector<pgr_mst_rt>
+std::vector<MST_rt>
 get_no_edge_graph_result(
         std::vector<int64_t> vids) {
-    std::vector<pgr_mst_rt> results;
+    std::vector<MST_rt> results;
     if (vids.empty()) return results;
     for (auto const root : clean_vids(vids)) {
         results.push_back({root, 0, root, -1, 0.0, 0.0});
diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c
index 2a3a65024da..99ceabf9345 100644
--- a/src/spanningTree/kruskal.c
+++ b/src/spanningTree/kruskal.c
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/time_msg.h"
 #include "c_common/edges_input.h"
 #include "c_common/arrays_input.h"
-#include "c_types/pgr_mst_rt.h"
+#include "c_types/mst_rt.h"
 
 #include "drivers/spanningTree/mst_common.h"
 #include "drivers/spanningTree/kruskal_driver.h"
@@ -54,7 +54,7 @@ process(
         int64_t max_depth,
         double distance,
 
-        pgr_mst_rt **result_tuples,
+        MST_rt **result_tuples,
         size_t *result_count) {
     pgr_SPI_connect();
 
@@ -112,7 +112,7 @@ PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS) {
     FuncCallContext     *funcctx;
     TupleDesc           tuple_desc;
 
-    pgr_mst_rt *result_tuples = NULL;
+    MST_rt *result_tuples = NULL;
     size_t result_count = 0;
 
     if (SRF_IS_FIRSTCALL()) {
@@ -147,7 +147,7 @@ PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS) {
 
     funcctx = SRF_PERCALL_SETUP();
     tuple_desc = funcctx->tuple_desc;
-    result_tuples = (pgr_mst_rt*) funcctx->user_fctx;
+    result_tuples = (MST_rt*) funcctx->user_fctx;
 
     if (funcctx->call_cntr < funcctx->max_calls) {
         HeapTuple    tuple;
diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp
index d58eb66c6bc..b74cefb57a6 100644
--- a/src/spanningTree/kruskal_driver.cpp
+++ b/src/spanningTree/kruskal_driver.cpp
@@ -53,7 +53,7 @@ do_pgr_kruskal(
         int64_t max_depth,
         double distance,
 
-        pgr_mst_rt **return_tuples,
+        MST_rt **return_tuples,
         size_t *return_count,
 
         char ** log_msg,
@@ -72,7 +72,7 @@ do_pgr_kruskal(
         std::vector<int64_t> roots(rootsArr, rootsArr + size_rootsArr);
         std::string suffix(fn_suffix);
 
-        std::vector<pgr_mst_rt> results;
+        std::vector<MST_rt> results;
 
         if (total_edges == 0) {
             results = pgrouting::details::get_no_edge_graph_result(roots);
diff --git a/src/spanningTree/prim.c b/src/spanningTree/prim.c
index 2f8534e0855..85f8eeb1581 100644
--- a/src/spanningTree/prim.c
+++ b/src/spanningTree/prim.c
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/time_msg.h"
 #include "c_common/edges_input.h"
 #include "c_common/arrays_input.h"
-#include "c_types/pgr_mst_rt.h"
+#include "c_types/mst_rt.h"
 
 #include "drivers/spanningTree/mst_common.h"
 #include "drivers/spanningTree/prim_driver.h"
@@ -53,7 +53,7 @@ process(
         int64_t max_depth,
         double distance,
 
-        pgr_mst_rt **result_tuples,
+        MST_rt **result_tuples,
         size_t *result_count) {
     pgr_SPI_connect();
 
@@ -117,7 +117,7 @@ PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS) {
     FuncCallContext     *funcctx;
     TupleDesc           tuple_desc;
 
-    pgr_mst_rt *result_tuples = NULL;
+    MST_rt *result_tuples = NULL;
     size_t result_count = 0;
 
     if (SRF_IS_FIRSTCALL()) {
@@ -152,7 +152,7 @@ PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS) {
 
     funcctx = SRF_PERCALL_SETUP();
     tuple_desc = funcctx->tuple_desc;
-    result_tuples = (pgr_mst_rt*) funcctx->user_fctx;
+    result_tuples = (MST_rt*) funcctx->user_fctx;
 
     if (funcctx->call_cntr < funcctx->max_calls) {
         HeapTuple    tuple;
diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp
index ddb960e62ed..26b043c0f75 100644
--- a/src/spanningTree/prim_driver.cpp
+++ b/src/spanningTree/prim_driver.cpp
@@ -36,6 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/pgr_alloc.hpp"
 #include "cpp_common/pgr_assert.h"
 
+#include "c_types/mst_rt.h"
+
 #include "spanningTree/pgr_prim.hpp"
 #include "spanningTree/details.hpp"
 
@@ -53,7 +55,7 @@ do_pgr_prim(
         int64_t max_depth,
         double distance,
 
-        pgr_mst_rt **return_tuples,
+        MST_rt **return_tuples,
         size_t *return_count,
 
         char ** log_msg,
@@ -72,7 +74,7 @@ do_pgr_prim(
         std::vector<int64_t> roots(rootsArr, rootsArr + size_rootsArr);
         std::string suffix(fn_suffix);
 
-        std::vector<pgr_mst_rt> results;
+        std::vector<MST_rt> results;
 
         if (total_edges == 0) {
             results = pgrouting::details::get_no_edge_graph_result(roots);
diff --git a/src/traversal/depthFirstSearch.c b/src/traversal/depthFirstSearch.c
index 187a06d4245..4db33e4d0b0 100644
--- a/src/traversal/depthFirstSearch.c
+++ b/src/traversal/depthFirstSearch.c
@@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/edges_input.h"
 #include "c_common/arrays_input.h"
 
+#include "c_types/mst_rt.h"
+
 #include "drivers/traversal/depthFirstSearch_driver.h"
 
 PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS);
@@ -72,7 +74,7 @@ process(
         bool directed,
         int64_t max_depth,
 
-        pgr_mst_rt **result_tuples,
+        MST_rt **result_tuples,
         size_t *result_count) {
     pgr_SPI_connect();
 
@@ -135,7 +137,7 @@ PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS) {
     TupleDesc           tuple_desc;
 
     /**********************************************************************/
-    pgr_mst_rt *result_tuples = NULL;
+    MST_rt *result_tuples = NULL;
     size_t result_count = 0;
     /**********************************************************************/
 
@@ -184,7 +186,7 @@ PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS) {
 
     funcctx = SRF_PERCALL_SETUP();
     tuple_desc = funcctx->tuple_desc;
-    result_tuples = (pgr_mst_rt*) funcctx->user_fctx;
+    result_tuples = (MST_rt*) funcctx->user_fctx;
 
     if (funcctx->call_cntr < funcctx->max_calls) {
         HeapTuple    tuple;
diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp
index b15484c3f72..1403d0c32f8 100644
--- a/src/traversal/depthFirstSearch_driver.cpp
+++ b/src/traversal/depthFirstSearch_driver.cpp
@@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 template < class G >
-std::vector < pgr_mst_rt >
+std::vector < MST_rt >
 pgr_depthFirstSearch(
         G &graph,
         std::vector < int64_t > roots,
@@ -125,7 +125,7 @@ do_pgr_depthFirstSearch(
         bool directed,
         int64_t max_depth,
 
-        pgr_mst_rt **return_tuples,
+        MST_rt **return_tuples,
         size_t *return_count,
 
         char ** log_msg,
@@ -143,7 +143,7 @@ do_pgr_depthFirstSearch(
 
         std::vector < int64_t > roots(rootsArr, rootsArr + size_rootsArr);
 
-        std::vector < pgr_mst_rt > results;
+        std::vector < MST_rt > results;
 
         graphType gType = directed ? DIRECTED : UNDIRECTED;