diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 179dba2..a126a70 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,7 +59,6 @@ target_link_libraries(${TARGET}
 
 target_include_directories(${TARGET}
     PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/json_types>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     PUBLIC
diff --git a/src/accessibility_impl.cpp b/src/accessibility_impl.cpp
index 5d91f11..0d02fff 100644
--- a/src/accessibility_impl.cpp
+++ b/src/accessibility_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "accessibility_impl.h"
-#include "jsondata_accessibility_types.h"
+#include "json_types/accessibility.h"
 
 namespace Firebolt::Accessibility
 {
diff --git a/src/advertising_impl.cpp b/src/advertising_impl.cpp
index 159340e..5c32d99 100644
--- a/src/advertising_impl.cpp
+++ b/src/advertising_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "advertising_impl.h"
-#include "jsondata_advertising_types.h"
+#include "json_types/advertising.h"
 
 namespace Firebolt::Advertising
 {
diff --git a/src/device_impl.cpp b/src/device_impl.cpp
index 5f286b5..58447ff 100644
--- a/src/device_impl.cpp
+++ b/src/device_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "device_impl.h"
-#include "jsondata_device_types.h"
+#include "json_types/device.h"
 
 namespace Firebolt::Device
 {
diff --git a/src/discovery_impl.cpp b/src/discovery_impl.cpp
index 63e91ef..cc209c0 100644
--- a/src/discovery_impl.cpp
+++ b/src/discovery_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "discovery_impl.h"
-#include "jsondata_common.h"
+#include "json_types/common.h"
 #include <firebolt/json_types.h>
 
 namespace Firebolt::Discovery
diff --git a/src/display_impl.cpp b/src/display_impl.cpp
index 5c93516..8e27d49 100644
--- a/src/display_impl.cpp
+++ b/src/display_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "display_impl.h"
-#include "jsondata_display_types.h"
+#include "json_types/display.h"
 
 namespace Firebolt::Display
 {
diff --git a/src/json_types/jsondata_accessibility_types.h b/src/json_types/accessibility.h
similarity index 100%
rename from src/json_types/jsondata_accessibility_types.h
rename to src/json_types/accessibility.h
diff --git a/src/json_types/jsondata_advertising_types.h b/src/json_types/advertising.h
similarity index 100%
rename from src/json_types/jsondata_advertising_types.h
rename to src/json_types/advertising.h
diff --git a/src/json_types/jsondata_common.h b/src/json_types/common.h
similarity index 100%
rename from src/json_types/jsondata_common.h
rename to src/json_types/common.h
diff --git a/src/json_types/jsondata_device_types.h b/src/json_types/device.h
similarity index 100%
rename from src/json_types/jsondata_device_types.h
rename to src/json_types/device.h
diff --git a/src/json_types/jsondata_display_types.h b/src/json_types/display.h
similarity index 100%
rename from src/json_types/jsondata_display_types.h
rename to src/json_types/display.h
diff --git a/src/json_types/jsondata_lifecycle_types.h b/src/json_types/lifecycle.h
similarity index 100%
rename from src/json_types/jsondata_lifecycle_types.h
rename to src/json_types/lifecycle.h
diff --git a/src/json_types/jsondata_metrics_types.h b/src/json_types/metrics.h
similarity index 100%
rename from src/json_types/jsondata_metrics_types.h
rename to src/json_types/metrics.h
diff --git a/src/json_types/jsondata_stats_types.h b/src/json_types/stats.h
similarity index 100%
rename from src/json_types/jsondata_stats_types.h
rename to src/json_types/stats.h
diff --git a/src/json_types/jsondata_texttospeech_types.h b/src/json_types/texttospeech.h
similarity index 100%
rename from src/json_types/jsondata_texttospeech_types.h
rename to src/json_types/texttospeech.h
diff --git a/src/lifecycle_impl.cpp b/src/lifecycle_impl.cpp
index 2f352a1..0380b56 100644
--- a/src/lifecycle_impl.cpp
+++ b/src/lifecycle_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "lifecycle_impl.h"
-#include "jsondata_lifecycle_types.h"
+#include "json_types/lifecycle.h"
 #include <cctype>
 #include <nlohmann/json.hpp>
 #include <string>
diff --git a/src/metrics_impl.cpp b/src/metrics_impl.cpp
index e7adf68..892be95 100644
--- a/src/metrics_impl.cpp
+++ b/src/metrics_impl.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "metrics_impl.h"
-#include "jsondata_common.h"
-#include "jsondata_metrics_types.h"
+#include "json_types/common.h"
+#include "json_types/metrics.h"
 #include <firebolt/json_types.h>
 
 namespace Firebolt::Metrics
diff --git a/src/stats_impl.cpp b/src/stats_impl.cpp
index 1a51441..a61e413 100644
--- a/src/stats_impl.cpp
+++ b/src/stats_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "stats_impl.h"
-#include "jsondata_stats_types.h"
+#include "json_types/stats.h"
 #include <cctype>
 #include <nlohmann/json.hpp>
 #include <string>
diff --git a/src/texttospeech_impl.cpp b/src/texttospeech_impl.cpp
index c8a7531..d02d17d 100644
--- a/src/texttospeech_impl.cpp
+++ b/src/texttospeech_impl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "texttospeech_impl.h"
-#include "jsondata_texttospeech_types.h"
+#include "json_types/texttospeech.h"
 
 namespace Firebolt::TextToSpeech
 {
diff --git a/test/api_test_app/apis/deviceDemo.cpp b/test/api_test_app/apis/deviceDemo.cpp
index 23c9416..94c9cb2 100644
--- a/test/api_test_app/apis/deviceDemo.cpp
+++ b/test/api_test_app/apis/deviceDemo.cpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include "json_types/jsondata_device_types.h"
+#include "json_types/device.h"
 
 using namespace Firebolt;
 using namespace Firebolt::Device;
diff --git a/test/api_test_app/apis/discoveryDemo.cpp b/test/api_test_app/apis/discoveryDemo.cpp
index 80ab403..0e3afba 100644
--- a/test/api_test_app/apis/discoveryDemo.cpp
+++ b/test/api_test_app/apis/discoveryDemo.cpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#include "json_types/jsondata_common.h"
+#include "json_types/common.h"
 
 using namespace Firebolt;
 using namespace Firebolt::Discovery;
diff --git a/test/api_test_app/apis/lifecycleDemo.cpp b/test/api_test_app/apis/lifecycleDemo.cpp
index d079d7f..a550527 100644
--- a/test/api_test_app/apis/lifecycleDemo.cpp
+++ b/test/api_test_app/apis/lifecycleDemo.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "lifecycleDemo.h"
-#include "json_types/jsondata_lifecycle_types.h"
+#include "json_types/lifecycle.h"
 #include "utils.h"
 #include <firebolt/firebolt.h>
 #include <iostream>
diff --git a/test/component/deviceTest.cpp b/test/component/deviceTest.cpp
index bf63894..4db04f9 100644
--- a/test/component/deviceTest.cpp
+++ b/test/component/deviceTest.cpp
@@ -16,9 +16,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "json_types/device.h"
 #include "firebolt/firebolt.h"
 #include "json_engine.h"
-#include "json_types/jsondata_device_types.h"
 #include "utils.h"
 #include <gtest/gtest.h>
 #include <iostream>
diff --git a/test/unit/deviceTest.cpp b/test/unit/deviceTest.cpp
index 8b8207a..33a4f28 100644
--- a/test/unit/deviceTest.cpp
+++ b/test/unit/deviceTest.cpp
@@ -16,9 +16,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "json_types/device.h"
 #include "device_impl.h"
 #include "json_engine.h"
-#include "json_types/jsondata_device_types.h"
 #include "mock_helper.h"
 
 class DeviceTest : public ::testing::Test, protected MockBase