diff --git a/power_grid_model_io_native_c/power_grid_model_io_native/include/power_grid_model_io_native/vnf_converter/vnf_pgm_converter.hpp b/power_grid_model_io_native_c/power_grid_model_io_native/include/power_grid_model_io_native/vnf_converter/vnf_pgm_converter.hpp
index a8ee780..0aecf88 100644
--- a/power_grid_model_io_native_c/power_grid_model_io_native/include/power_grid_model_io_native/vnf_converter/vnf_pgm_converter.hpp
+++ b/power_grid_model_io_native_c/power_grid_model_io_native/include/power_grid_model_io_native/vnf_converter/vnf_pgm_converter.hpp
@@ -17,6 +17,8 @@
 
 #include <iostream>
 
+namespace power_grid_model_io_native {
+
 inline power_grid_model::ConstDataset
 create_const_dataset_from_container(power_grid_model::Container<power_grid_model::Node> const& /*container*/,
                                     power_grid_model::meta_data::MetaData const& meta_data) {
@@ -32,7 +34,7 @@ inline std::string serialize_data(power_grid_model::ConstDataset const& const_da
     return serialized_pgm_data;
 }
 
-using namespace power_grid_model_io_native;
+// using namespace power_grid_model_io_native;
 
 class PgmVnfConverter {
   public:
@@ -173,4 +175,6 @@ inline std::string const& convert_input_wrapper(PgmVnfConverter* obj) {
     return obj->get_serialized_data();
 }
 
+} // namespace power_grid_model_io_native
+
 #endif // POWER_GRID_MODEL_IO_NATIVE_C_VNF_PGM_CONVERTER_HPP
diff --git a/power_grid_model_io_native_c/power_grid_model_io_native_c/src/vnf_pgm_converter.cpp b/power_grid_model_io_native_c/power_grid_model_io_native_c/src/vnf_pgm_converter.cpp
index 5d3e506..0de60a1 100644
--- a/power_grid_model_io_native_c/power_grid_model_io_native_c/src/vnf_pgm_converter.cpp
+++ b/power_grid_model_io_native_c/power_grid_model_io_native_c/src/vnf_pgm_converter.cpp
@@ -12,6 +12,8 @@
 
 #include <power_grid_model/auxiliary/dataset.hpp>
 
+using namespace power_grid_model_io_native;
+
 using power_grid_model::ConstDataset;
 
 struct PGM_IO_VnfConverter : public PgmVnfConverter {