diff --git a/src/class_diagram/generators/cppidx/class_diagram_generator.cc b/src/class_diagram/generators/json/class_diagram_generator.cc
similarity index 93%
rename from src/class_diagram/generators/cppidx/class_diagram_generator.cc
rename to src/class_diagram/generators/json/class_diagram_generator.cc
index 47cdd504..e367cd5b 100644
--- a/src/class_diagram/generators/cppidx/class_diagram_generator.cc
+++ b/src/class_diagram/generators/json/class_diagram_generator.cc
@@ -1,5 +1,5 @@
 /**
- * src/class_diagram/generators/cppidx/class_diagram_generator.cc
+ * src/class_diagram/generators/json/class_diagram_generator.cc
  *
  * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
  *
@@ -20,7 +20,7 @@
 
 #include "util/error.h"
 
-namespace clanguml::class_diagram::generators::cppidx {
+namespace clanguml::class_diagram::generators::json {
 
 generator::generator(diagram_config &config, diagram_model &model)
     : common_generator<diagram_config, diagram_model>{config, model}
diff --git a/src/class_diagram/generators/cppidx/class_diagram_generator.h b/src/class_diagram/generators/json/class_diagram_generator.h
similarity index 90%
rename from src/class_diagram/generators/cppidx/class_diagram_generator.h
rename to src/class_diagram/generators/json/class_diagram_generator.h
index 28841fbd..1d58f2d9 100644
--- a/src/class_diagram/generators/cppidx/class_diagram_generator.h
+++ b/src/class_diagram/generators/json/class_diagram_generator.h
@@ -1,5 +1,5 @@
 /**
- * src/class_diagram/generators/cppidx/class_diagram_generator.h
+ * src/class_diagram/generators/json/class_diagram_generator.h
  *
  * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
  *
@@ -22,7 +22,7 @@
 #include "class_diagram/model/diagram.h"
 #include "class_diagram/model/enum.h"
 #include "class_diagram/visitor/translation_unit_visitor.h"
-#include "common/generators/cppidx/generator.h"
+#include "common/generators/json/generator.h"
 #include "common/generators/nested_element_stack.h"
 #include "common/model/relationship.h"
 #include "config/config.h"
@@ -39,12 +39,12 @@
 namespace clanguml {
 namespace class_diagram {
 namespace generators {
-namespace cppidx {
+namespace json {
 
 using diagram_config = clanguml::config::class_diagram;
 using diagram_model = clanguml::class_diagram::model::diagram;
 template <typename C, typename D>
-using common_generator = clanguml::common::generators::cppidx::generator<C, D>;
+using common_generator = clanguml::common::generators::json::generator<C, D>;
 
 using clanguml::class_diagram::model::class_;
 using clanguml::class_diagram::model::class_element;
@@ -72,7 +72,7 @@ private:
     mutable nlohmann::json json_;
 };
 
-} // namespace cppidx
+} // namespace json
 } // namespace generators
 } // namespace class_diagram
 } // namespace clanguml
diff --git a/src/cli/cli_handler.cc b/src/cli/cli_handler.cc
index 084f9188..7bad2977 100644
--- a/src/cli/cli_handler.cc
+++ b/src/cli/cli_handler.cc
@@ -61,7 +61,7 @@ cli_flow_t cli_handler::parse(int argc, const char **argv)
     static const std::map<std::string, clanguml::common::generator_type_t>
         generator_type_names{
             {"plantuml", clanguml::common::generator_type_t::plantuml},
-            {"cppidx", clanguml::common::generator_type_t::cppidx}};
+            {"json", clanguml::common::generator_type_t::json}};
 
     app.add_option("-c,--config", config_path,
         "Location of configuration file, when '-' read from stdin");
diff --git a/src/common/generators/generators.h b/src/common/generators/generators.h
index 17e4d3a0..5e260619 100644
--- a/src/common/generators/generators.h
+++ b/src/common/generators/generators.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include "class_diagram/generators/cppidx/class_diagram_generator.h"
+#include "class_diagram/generators/json/class_diagram_generator.h"
 #include "class_diagram/generators/plantuml/class_diagram_generator.h"
 #include "cli/cli_handler.h"
 #include "common/generators/generators.h"
@@ -237,12 +237,12 @@ void generate_diagram(const std::string &od, const std::string &name,
 
                 LOG_INFO("Written {} diagram to {}", name, path.string());
             }
-            else if (generator_type == generator_type_t::cppidx) {
+            else if (generator_type == generator_type_t::json) {
                 auto path =
                     std::filesystem::path{od} / fmt::format("{}.json", name);
                 std::ofstream ofs;
                 ofs.open(path, std::ofstream::out | std::ofstream::trunc);
-                ofs << clanguml::class_diagram::generators::cppidx::generator(
+                ofs << clanguml::class_diagram::generators::json::generator(
                     dynamic_cast<diagram_config &>(*diagram), *model);
 
                 ofs.close();
diff --git a/src/common/generators/cppidx/generator.h b/src/common/generators/json/generator.h
similarity index 94%
rename from src/common/generators/cppidx/generator.h
rename to src/common/generators/json/generator.h
index 9a70063e..0a542edb 100644
--- a/src/common/generators/cppidx/generator.h
+++ b/src/common/generators/json/generator.h
@@ -1,5 +1,5 @@
 /**
- * src/common/generators/cppidx/generator.h
+ * src/common/generators/json/generator.h
  *
  * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
  *
@@ -29,7 +29,7 @@
 
 #include <ostream>
 
-namespace clanguml::common::generators::cppidx {
+namespace clanguml::common::generators::json {
 
 using clanguml::common::model::access_t;
 using clanguml::common::model::element;
@@ -83,4 +83,4 @@ std::ostream &operator<<(
     return os;
 }
 
-} // namespace clanguml::common::generators::cppidx
\ No newline at end of file
+} // namespace clanguml::common::generators::json
\ No newline at end of file
diff --git a/src/common/types.h b/src/common/types.h
index 557a3c3c..65a8d980 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -27,7 +27,7 @@ namespace clanguml::common {
 
 using id_t = int64_t;
 
-enum class generator_type_t { plantuml, cppidx };
+enum class generator_type_t { plantuml, json };
 
 template <typename T> class optional_ref {
 public: