Renames policy_premium folder to policy_external

149 files changed, 79 insertions, 79 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f655332c4..4abd83e302 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,9 +283,9 @@ endif()
 
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
     add_definitions(-DEXTERNAL_PROPRIETARY)
-    set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_premium/)
-    set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_premium/)
-    set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_premium/)
+    set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_external/)
+    set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_external/)
+    set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_external/)
     message(STATUS "DEFINED EXTERNAL_PROPRIETARY")
 else()
    if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY")
diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
index 04bd38d8f1..a18da422d4 100644
--- a/src/components/CMakeLists.txt
+++ b/src/components/CMakeLists.txt
@@ -61,7 +61,7 @@ endif()
 
 
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
-  add_subdirectory(./policy/policy_premium/)
+  add_subdirectory(./policy/policy_external/)
   message(STATUS "Use premium policy")
 else()
   add_subdirectory(./policy/policy_regular/)
diff --git a/src/components/include/policy/policy_premium/policy/policy_listener.h b/src/components/include/policy/policy_external/policy/policy_listener.h
index e24df05294..e24df05294 100644
--- a/src/components/include/policy/policy_premium/policy/policy_listener.h
+++ b/src/components/include/policy/policy_external/policy/policy_listener.h
diff --git a/src/components/include/policy/policy_premium/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h
index 8ff0154a7c..8ff0154a7c 100644
--- a/src/components/include/policy/policy_premium/policy/policy_manager.h
+++ b/src/components/include/policy/policy_external/policy/policy_manager.h
diff --git a/src/components/include/policy/policy_premium/policy/policy_settings.h b/src/components/include/policy/policy_external/policy/policy_settings.h
index def9fca05a..def9fca05a 100644
--- a/src/components/include/policy/policy_premium/policy/policy_settings.h
+++ b/src/components/include/policy/policy_external/policy/policy_settings.h
diff --git a/src/components/include/policy/policy_premium/policy/usage_statistics/app_stopwatch.h b/src/components/include/policy/policy_external/policy/usage_statistics/app_stopwatch.h
index 45883163c4..45883163c4 100644
--- a/src/components/include/policy/policy_premium/policy/usage_statistics/app_stopwatch.h
+++ b/src/components/include/policy/policy_external/policy/usage_statistics/app_stopwatch.h
diff --git a/src/components/include/policy/policy_premium/policy/usage_statistics/statistics_manager.h b/src/components/include/policy/policy_external/policy/usage_statistics/statistics_manager.h
index a74bb0592e..a74bb0592e 100644
--- a/src/components/include/policy/policy_premium/policy/usage_statistics/statistics_manager.h
+++ b/src/components/include/policy/policy_external/policy/usage_statistics/statistics_manager.h
diff --git a/src/components/policy/policy_premium/.gitignore b/src/components/policy/policy_external/.gitignore
index 3e5fc41721..3e5fc41721 100644
--- a/src/components/policy/policy_premium/.gitignore
+++ b/src/components/policy/policy_external/.gitignore
diff --git a/src/components/policy/policy_premium/CMakeLists.txt b/src/components/policy/policy_external/CMakeLists.txt
index e49a1311ba..e49a1311ba 100644
--- a/src/components/policy/policy_premium/CMakeLists.txt
+++ b/src/components/policy/policy_external/CMakeLists.txt
diff --git a/src/components/policy/policy_premium/Readme.txt b/src/components/policy/policy_external/Readme.txt
index 370fab238a..370fab238a 100644
--- a/src/components/policy/policy_premium/Readme.txt
+++ b/src/components/policy/policy_external/Readme.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/AppMgr/index.txt b/src/components/policy/policy_external/doc/doxygen/components/AppMgr/index.txt
index 17584b09e1..17584b09e1 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/AppMgr/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/AppMgr/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/HMI/index.txt b/src/components/policy/policy_external/doc/doxygen/components/HMI/index.txt
index 361763118d..361763118d 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/HMI/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/HMI/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/JSONHandler/Formatters/index.txt b/src/components/policy/policy_external/doc/doxygen/components/JSONHandler/Formatters/index.txt
index 9854b88d5f..9854b88d5f 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/JSONHandler/Formatters/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/JSONHandler/Formatters/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/JSONHandler/index.txt b/src/components/policy/policy_external/doc/doxygen/components/JSONHandler/index.txt
index a65c8ddc7d..a65c8ddc7d 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/JSONHandler/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/JSONHandler/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/ProtocolHandler/index.txt b/src/components/policy/policy_external/doc/doxygen/components/ProtocolHandler/index.txt
index c5b5ceb79c..c5b5ceb79c 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/ProtocolHandler/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/ProtocolHandler/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart
index e69de29bb2..e69de29bb2 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Types/Type casts.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Types/Type casts.txt
index 3ae636c925..3ae636c925 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Types/Type casts.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Types/Type casts.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Types/Value representation.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Types/Value representation.txt
index 6505ae6f43..6505ae6f43 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Types/Value representation.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Types/Value representation.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Types/index.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Types/index.txt
index 61ca201507..61ca201507 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Types/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Types/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt
index 2e611f74b9..2e611f74b9 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Validation/Validation.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Validation.txt
index a02f0be4bd..a02f0be4bd 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Validation/Validation.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Validation.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Validation/index.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/index.txt
index d425791873..d425791873 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Smart Objects Validation/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Use b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Use
index e69de29bb2..e69de29bb2 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Use
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Use
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Use of Smart Objects/index.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Use of Smart Objects/index.txt
index d270436890..d270436890 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/Use of Smart Objects/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Use of Smart Objects/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/index.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/index.txt
index 3844e1ab69..3844e1ab69 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/SmartObjects/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/ConnectionManagement.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/ConnectionManagement.txt
index 2ba273e9d4..2ba273e9d4 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/ConnectionManagement.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/ConnectionManagement.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/DataTransfer.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/DataTransfer.txt
index 98dd7426be..98dd7426be 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/DataTransfer.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/DataTransfer.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/DeviceManagement.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/DeviceManagement.txt
index eb5f3e477e..eb5f3e477e 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/DeviceManagement.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/DeviceManagement.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/index.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/index.txt
index 8916dbeb55..8916dbeb55 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Client Specification/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Client Specification/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal
index e69de29bb2..e69de29bb2 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/BluetoothAdapter.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/BluetoothAdapter.txt
index 970aeffd83..970aeffd83 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/BluetoothAdapter.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/BluetoothAdapter.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/TCPAdapter.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/TCPAdapter.txt
index d81b70dfe8..d81b70dfe8 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/TCPAdapter.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/TCPAdapter.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/index.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/index.txt
index 3a5d0f0e91..3a5d0f0e91 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Device Adapters/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Interaction.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Interaction.txt
index 655d0a1290..655d0a1290 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/Interaction.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/Interaction.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/MultiThreading.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/MultiThreading.txt
index 6c35f0962f..6c35f0962f 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/MultiThreading.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/MultiThreading.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/TrasportManager.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/TrasportManager.txt
index c96fd46a22..c96fd46a22 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/TrasportManager.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/TrasportManager.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/index.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/index.txt
index b29ec48dd1..b29ec48dd1 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Internal Design/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Internal Design/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/UseCase1.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/UseCase1.txt
index 4af46e4320..4af46e4320 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/UseCase1.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/UseCase1.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/UseCase2.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/UseCase2.txt
index de1d6baae0..de1d6baae0 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/UseCase2.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/UseCase2.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/UseCase3.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/UseCase3.txt
index f11faadfdc..f11faadfdc 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/UseCase3.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/UseCase3.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/index.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/index.txt
index c929a16a88..c929a16a88 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/Use Cases/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/Use Cases/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/index.txt b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/index.txt
index 73252c751c..73252c751c 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/TransportManager/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/TransportManager/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/components/index.txt b/src/components/policy/policy_external/doc/doxygen/components/index.txt
index 186de88af0..186de88af0 100644
--- a/src/components/policy/policy_premium/doc/doxygen/components/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/info.txt b/src/components/policy/policy_external/doc/doxygen/info.txt
index e8afe55c12..e8afe55c12 100644
--- a/src/components/policy/policy_premium/doc/doxygen/info.txt
+++ b/src/components/policy/policy_external/doc/doxygen/info.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/mainpage.txt b/src/components/policy/policy_external/doc/doxygen/mainpage.txt
index 5cd05e2606..5cd05e2606 100644
--- a/src/components/policy/policy_premium/doc/doxygen/mainpage.txt
+++ b/src/components/policy/policy_external/doc/doxygen/mainpage.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/Arhitecture.txt b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/Arhitecture.txt
index 4cf9e84d99..4cf9e84d99 100644
--- a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/Arhitecture.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/Arhitecture.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/CMake Integration.txt b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/CMake Integration.txt
index b4fb0b3df5..b4fb0b3df5 100644
--- a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/CMake Integration.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/CMake Integration.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/How To Use.txt b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/How To Use.txt
index 0f9e340bc5..0f9e340bc5 100644
--- a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/How To Use.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/How To Use.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/Use of Output.txt b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/Use of Output.txt
index b486fd7e37..b486fd7e37 100644
--- a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/Use of Output.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/Use of Output.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/index.txt b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/index.txt
index 21b437f6b7..21b437f6b7 100644
--- a/src/components/policy/policy_premium/doc/doxygen/tools/InterfaceGenerator/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/index.txt
diff --git a/src/components/policy/policy_premium/doc/doxygen/tools/index.txt b/src/components/policy/policy_external/doc/doxygen/tools/index.txt
index 4befa33e8d..4befa33e8d 100644
--- a/src/components/policy/policy_premium/doc/doxygen/tools/index.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/index.txt
diff --git a/src/components/policy/policy_premium/doc/grc/conf.smartDeviceLinkCore b/src/components/policy/policy_external/doc/grc/conf.smartDeviceLinkCore
index a026407723..a026407723 100644
--- a/src/components/policy/policy_premium/doc/grc/conf.smartDeviceLinkCore
+++ b/src/components/policy/policy_external/doc/grc/conf.smartDeviceLinkCore
diff --git a/src/components/policy/policy_premium/doc/grc/grc.conf b/src/components/policy/policy_external/doc/grc/grc.conf
index dfd3d4cbef..dfd3d4cbef 100644
--- a/src/components/policy/policy_premium/doc/grc/grc.conf
+++ b/src/components/policy/policy_external/doc/grc/grc.conf
diff --git a/src/components/policy/policy_premium/doc/install.txt b/src/components/policy/policy_external/doc/install.txt
index c870856e97..c870856e97 100644
--- a/src/components/policy/policy_premium/doc/install.txt
+++ b/src/components/policy/policy_external/doc/install.txt
diff --git a/src/components/policy/policy_premium/doc/qnx_build.txt b/src/components/policy/policy_external/doc/qnx_build.txt
index 4f67d6eed3..4f67d6eed3 100644
--- a/src/components/policy/policy_premium/doc/qnx_build.txt
+++ b/src/components/policy/policy_external/doc/qnx_build.txt
diff --git a/src/components/policy/policy_premium/doc/readme.txt b/src/components/policy/policy_external/doc/readme.txt
index 66087df057..66087df057 100644
--- a/src/components/policy/policy_premium/doc/readme.txt
+++ b/src/components/policy/policy_external/doc/readme.txt
diff --git a/src/components/policy/policy_premium/include/policy/cache_manager.h b/src/components/policy/policy_external/include/policy/cache_manager.h
index 7c7e6cc738..522ec35575 100644
--- a/src/components/policy/policy_premium/include/policy/cache_manager.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager.h
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_CACHE_MANAGER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_CACHE_MANAGER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_H_
 
 #include <map>
 
@@ -833,4 +833,4 @@ class CacheManager : public CacheManagerInterface {
   const PolicySettings* settings_;
 };
 }  // namespace policy
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_CACHE_MANAGER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_H_
diff --git a/src/components/policy/policy_premium/include/policy/cache_manager_interface.h b/src/components/policy/policy_external/include/policy/cache_manager_interface.h
index 7b593e3886..c9c4e3103b 100644
--- a/src/components/policy/policy_premium/include/policy/cache_manager_interface.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager_interface.h
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_CACHE_MANAGER_INTERFACE_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_CACHE_MANAGER_INTERFACE_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_INTERFACE_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_INTERFACE_H_
 
 #include <string>
 #include <vector>
@@ -713,4 +713,4 @@ typedef utils::SharedPtr<CacheManagerInterface> CacheManagerInterfaceSPtr;
 
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_CACHE_MANAGER_INTERFACE_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_INTERFACE_H_
diff --git a/src/components/policy/policy_premium/include/policy/policy_helper.h b/src/components/policy/policy_external/include/policy/policy_helper.h
index 5c8c0fcc8f..9f8151e29f 100644
--- a/src/components/policy/policy_premium/include/policy/policy_helper.h
+++ b/src/components/policy/policy_external/include/policy/policy_helper.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_HELPER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_HELPER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_HELPER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_HELPER_H_
 
 #include "policy/policy_table/functions.h"
 #include "utils/shared_ptr.h"
@@ -259,4 +259,4 @@ FunctionalGroupIDs FindSame(const FunctionalGroupIDs& first,
 bool UnwrapAppPolicies(policy_table::ApplicationPolicies& app_policies);
 }
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_HELPER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_HELPER_H_
diff --git a/src/components/policy/policy_premium/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
index b5901ddafd..2fcf523e34 100644
--- a/src/components/policy/policy_premium/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
 
 #include <list>
 #include "utils/shared_ptr.h"
@@ -338,4 +338,4 @@ class PolicyManagerImpl : public PolicyManager {
 
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_
diff --git a/src/components/policy/policy_premium/include/policy/policy_table.h b/src/components/policy/policy_external/include/policy/policy_table.h
index a00e4a25df..ecbd56c2e4 100644
--- a/src/components/policy/policy_premium/include/policy/policy_table.h
+++ b/src/components/policy/policy_external/include/policy/policy_table.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_
 
 #include "utils/shared_ptr.h"
 #include "policy/pt_representation.h"
@@ -59,4 +59,4 @@ class PolicyTable {
 };
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_
diff --git a/src/components/policy/policy_premium/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h
index 959e22d005..9dceeb1c4a 100644
--- a/src/components/policy/policy_premium/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
 
 #include <string>
 
@@ -165,4 +165,4 @@ extern const std::string kDeviceApp;
 }  // namespace policy_table_interface_base
 }  // namespace rpc
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
diff --git a/src/components/policy/policy_premium/include/policy/policy_table/functions.h b/src/components/policy/policy_external/include/policy/policy_table/functions.h
index 7152fbae47..07d4a42a25 100644
--- a/src/components/policy/policy_premium/include/policy/policy_table/functions.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/functions.h
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_FUNCTIONS_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_FUNCTIONS_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_FUNCTIONS_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_FUNCTIONS_H_
 
 #include "policy/policy_table/enums.h"
 #include "policy/policy_table/types.h"
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_FUNCTIONS_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_FUNCTIONS_H_
diff --git a/src/components/policy/policy_premium/include/policy/policy_table/types.h b/src/components/policy/policy_external/include/policy/policy_table/types.h
index e943616299..8ca91c310a 100644
--- a/src/components/policy/policy_premium/include/policy/policy_table/types.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/types.h
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_TYPES_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TABLE_TYPES_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_TYPES_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_TYPES_H_
 
 #include <climits>
 #include "utils/macro.h"
diff --git a/src/components/policy/policy_premium/include/policy/policy_table_interface.xml b/src/components/policy/policy_external/include/policy/policy_table_interface.xml
index 60c547ce2d..60c547ce2d 100644
--- a/src/components/policy/policy_premium/include/policy/policy_table_interface.xml
+++ b/src/components/policy/policy_external/include/policy/policy_table_interface.xml
diff --git a/src/components/policy/policy_premium/include/policy/policy_table_interface_ext.xml b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
index 91518f8f6e..91518f8f6e 100644
--- a/src/components/policy/policy_premium/include/policy/policy_table_interface_ext.xml
+++ b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml
diff --git a/src/components/policy/policy_premium/include/policy/policy_types.h b/src/components/policy/policy_external/include/policy/policy_types.h
index e65de9132a..e0f7d89ae9 100644
--- a/src/components/policy/policy_premium/include/policy/policy_types.h
+++ b/src/components/policy/policy_external/include/policy/policy_types.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TYPES_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TYPES_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_
 
 #include <algorithm>
 #include <string>
@@ -366,4 +366,4 @@ struct MetaInfo {
 
 }  //  namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_POLICY_TYPES_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_
diff --git a/src/components/policy/policy_premium/include/policy/pt_ext_representation.h b/src/components/policy/policy_external/include/policy/pt_ext_representation.h
index 6df062d430..ca3d45e946 100644
--- a/src/components/policy/policy_premium/include/policy/pt_ext_representation.h
+++ b/src/components/policy/policy_external/include/policy/pt_ext_representation.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_PT_EXT_REPRESENTATION_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_PT_EXT_REPRESENTATION_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_EXT_REPRESENTATION_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_EXT_REPRESENTATION_H_
 
 #include "policy/pt_representation.h"
 
@@ -330,4 +330,4 @@ class PTExtRepresentation : public virtual PTRepresentation {
 };
 }  //  namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_PT_EXT_REPRESENTATION_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_EXT_REPRESENTATION_H_
diff --git a/src/components/policy/policy_premium/include/policy/pt_representation.h b/src/components/policy/policy_external/include/policy/pt_representation.h
index 4253cb3e99..66a9218771 100644
--- a/src/components/policy/policy_premium/include/policy/pt_representation.h
+++ b/src/components/policy/policy_external/include/policy/pt_representation.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_PT_REPRESENTATION_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_PT_REPRESENTATION_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_REPRESENTATION_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_REPRESENTATION_H_
 
 #include <vector>
 #include <string>
@@ -325,4 +325,4 @@ class PTRepresentation {
 
 }  //  namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_PT_REPRESENTATION_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_REPRESENTATION_H_
diff --git a/src/components/policy/policy_premium/include/policy/sql_pt_ext_queries.h b/src/components/policy/policy_external/include/policy/sql_pt_ext_queries.h
index 7b373939e4..96406feaf1 100644
--- a/src/components/policy/policy_premium/include/policy/sql_pt_ext_queries.h
+++ b/src/components/policy/policy_external/include/policy/sql_pt_ext_queries.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_EXT_QUERIES_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_EXT_QUERIES_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_QUERIES_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_QUERIES_H_
 
 #include <string>
 
@@ -94,4 +94,4 @@ extern const std::string kDeleteAppConsent;
 }  // namespace sql_pt_ext
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_EXT_QUERIES_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_QUERIES_H_
diff --git a/src/components/policy/policy_premium/include/policy/sql_pt_ext_representation.h b/src/components/policy/policy_external/include/policy/sql_pt_ext_representation.h
index 6f33607194..99fe099a59 100644
--- a/src/components/policy/policy_premium/include/policy/sql_pt_ext_representation.h
+++ b/src/components/policy/policy_external/include/policy/sql_pt_ext_representation.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_
 
 #include <string>
 #include "policy/sql_pt_representation.h"
@@ -204,4 +204,4 @@ class SQLPTExtRepresentation : public SQLPTRepresentation,
 
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_
diff --git a/src/components/policy/policy_premium/include/policy/sql_pt_queries.h b/src/components/policy/policy_external/include/policy/sql_pt_queries.h
index 61d384a6eb..a0ff71ba13 100644
--- a/src/components/policy/policy_premium/include/policy/sql_pt_queries.h
+++ b/src/components/policy/policy_external/include/policy/sql_pt_queries.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_QUERIES_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_QUERIES_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_QUERIES_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_QUERIES_H_
 
 #include <string>
 
@@ -118,4 +118,4 @@ extern const std::string kUpdateDBVersion;
 }  // namespace sql_pt
 }  // namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_QUERIES_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_QUERIES_H_
diff --git a/src/components/policy/policy_premium/include/policy/sql_pt_representation.h b/src/components/policy/policy_external/include/policy/sql_pt_representation.h
index 4a29c7f80c..a2999b4bf5 100644
--- a/src/components/policy/policy_premium/include/policy/sql_pt_representation.h
+++ b/src/components/policy/policy_external/include/policy/sql_pt_representation.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_REPRESENTATION_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_REPRESENTATION_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_REPRESENTATION_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_REPRESENTATION_H_
 
 #include <string>
 #include <vector>
@@ -201,4 +201,4 @@ class SQLPTRepresentation : public virtual PTRepresentation {
 };
 }  //  namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_PT_REPRESENTATION_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_REPRESENTATION_H_
diff --git a/src/components/policy/policy_premium/include/policy/sql_wrapper.h b/src/components/policy/policy_external/include/policy/sql_wrapper.h
index 16ce620cc0..87fe1404a7 100644
--- a/src/components/policy/policy_premium/include/policy/sql_wrapper.h
+++ b/src/components/policy/policy_external/include/policy/sql_wrapper.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_WRAPPER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_WRAPPER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_WRAPPER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_WRAPPER_H_
 
 #if __QNX__
 #include "utils/qdb_wrapper/sql_database_impl.h"
@@ -42,4 +42,4 @@
 #include "utils/sqlite_wrapper/sql_query.h"
 #endif  // __QNX__
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_SQL_WRAPPER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_WRAPPER_H_
diff --git a/src/components/policy/policy_premium/include/policy/update_status_manager.h b/src/components/policy/policy_external/include/policy/update_status_manager.h
index 22f84dcfa8..eed9f7eae9 100644
--- a/src/components/policy/policy_premium/include/policy/update_status_manager.h
+++ b/src/components/policy/policy_external/include/policy/update_status_manager.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_
 
 #include "policy/policy_types.h"
 #include "utils/lock.h"
@@ -227,4 +227,4 @@ class UpdateStatusManager {
 };
 }
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_
diff --git a/src/components/policy/policy_premium/include/policy/usage_statistics/counter.h b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h
index 6aecb88645..adaef0eb28 100644
--- a/src/components/policy/policy_premium/include/policy/usage_statistics/counter.h
+++ b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_
 
 #include <ctime>
 #include "policy/usage_statistics/statistics_manager.h"
@@ -105,4 +105,4 @@ class AppStopwatchImpl : public AppStopwatch {
 
 }  // namespace usage_statistics
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_
diff --git a/src/components/policy/policy_premium/include/policy/user_consent_manager.h b/src/components/policy/policy_external/include/policy/user_consent_manager.h
index 89026fb012..0f242738b6 100644
--- a/src/components/policy/policy_premium/include/policy/user_consent_manager.h
+++ b/src/components/policy/policy_external/include/policy/user_consent_manager.h
@@ -30,8 +30,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_USER_CONSENT_MANAGER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_USER_CONSENT_MANAGER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USER_CONSENT_MANAGER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USER_CONSENT_MANAGER_H_
 
 namespace policy {
 class UserConsentManager {
@@ -41,4 +41,4 @@ class UserConsentManager {
 };
 }  //  namespace policy
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_INCLUDE_POLICY_USER_CONSENT_MANAGER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USER_CONSENT_MANAGER_H_
diff --git a/src/components/policy/policy_premium/specification.txt b/src/components/policy/policy_external/specification.txt
index b00a2932e0..b00a2932e0 100644
--- a/src/components/policy/policy_premium/specification.txt
+++ b/src/components/policy/policy_external/specification.txt
diff --git a/src/components/policy/policy_premium/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc
index 43ab80c586..43ab80c586 100644
--- a/src/components/policy/policy_premium/src/cache_manager.cc
+++ b/src/components/policy/policy_external/src/cache_manager.cc
diff --git a/src/components/policy/policy_premium/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc
index a477ca55d2..a477ca55d2 100644
--- a/src/components/policy/policy_premium/src/policy_helper.cc
+++ b/src/components/policy/policy_external/src/policy_helper.cc
diff --git a/src/components/policy/policy_premium/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index d7a1d943e8..d7a1d943e8 100644
--- a/src/components/policy/policy_premium/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
diff --git a/src/components/policy/policy_premium/src/policy_table.cc b/src/components/policy/policy_external/src/policy_table.cc
index 7a63fac50d..7a63fac50d 100644
--- a/src/components/policy/policy_premium/src/policy_table.cc
+++ b/src/components/policy/policy_external/src/policy_table.cc
diff --git a/src/components/policy/policy_premium/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index e70167c94b..e70167c94b 100644
--- a/src/components/policy/policy_premium/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
diff --git a/src/components/policy/policy_premium/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc
index 7505c4e416..7505c4e416 100644
--- a/src/components/policy/policy_premium/src/policy_table/types.cc
+++ b/src/components/policy/policy_external/src/policy_table/types.cc
diff --git a/src/components/policy/policy_premium/src/policy_table/validation.cc b/src/components/policy/policy_external/src/policy_table/validation.cc
index 83c959dbb4..83c959dbb4 100644
--- a/src/components/policy/policy_premium/src/policy_table/validation.cc
+++ b/src/components/policy/policy_external/src/policy_table/validation.cc
diff --git a/src/components/policy/policy_premium/src/sql_pt_ext_queries.cc b/src/components/policy/policy_external/src/sql_pt_ext_queries.cc
index 4a69aaf44f..4a69aaf44f 100644
--- a/src/components/policy/policy_premium/src/sql_pt_ext_queries.cc
+++ b/src/components/policy/policy_external/src/sql_pt_ext_queries.cc
diff --git a/src/components/policy/policy_premium/src/sql_pt_ext_representation.cc b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc
index dda00af168..dda00af168 100644
--- a/src/components/policy/policy_premium/src/sql_pt_ext_representation.cc
+++ b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc
diff --git a/src/components/policy/policy_premium/src/sql_pt_queries.cc b/src/components/policy/policy_external/src/sql_pt_queries.cc
index f40b31f83a..f40b31f83a 100644
--- a/src/components/policy/policy_premium/src/sql_pt_queries.cc
+++ b/src/components/policy/policy_external/src/sql_pt_queries.cc
diff --git a/src/components/policy/policy_premium/src/sql_pt_representation.cc b/src/components/policy/policy_external/src/sql_pt_representation.cc
index d3c385e352..d3c385e352 100644
--- a/src/components/policy/policy_premium/src/sql_pt_representation.cc
+++ b/src/components/policy/policy_external/src/sql_pt_representation.cc
diff --git a/src/components/policy/policy_premium/src/update_status_manager.cc b/src/components/policy/policy_external/src/update_status_manager.cc
index 4fc74270a2..4fc74270a2 100644
--- a/src/components/policy/policy_premium/src/update_status_manager.cc
+++ b/src/components/policy/policy_external/src/update_status_manager.cc
diff --git a/src/components/policy/policy_premium/src/usage_statistics/counter.cc b/src/components/policy/policy_external/src/usage_statistics/counter.cc
index 661ea29704..661ea29704 100644
--- a/src/components/policy/policy_premium/src/usage_statistics/counter.cc
+++ b/src/components/policy/policy_external/src/usage_statistics/counter.cc
diff --git a/src/components/policy/policy_premium/test/CMakeLists.txt b/src/components/policy/policy_external/test/CMakeLists.txt
index 8b77c90dd2..8b77c90dd2 100644
--- a/src/components/policy/policy_premium/test/CMakeLists.txt
+++ b/src/components/policy/policy_external/test/CMakeLists.txt
diff --git a/src/components/policy/policy_premium/test/counter_test.cc b/src/components/policy/policy_external/test/counter_test.cc
index 90f247de31..90f247de31 100644
--- a/src/components/policy/policy_premium/test/counter_test.cc
+++ b/src/components/policy/policy_external/test/counter_test.cc
diff --git a/src/components/policy/policy_premium/test/generated_code_test.cc b/src/components/policy/policy_external/test/generated_code_test.cc
index 1158b16fdb..1158b16fdb 100644
--- a/src/components/policy/policy_premium/test/generated_code_test.cc
+++ b/src/components/policy/policy_external/test/generated_code_test.cc
diff --git a/src/components/policy/policy_premium/test/include/policy/driver_dbms.h b/src/components/policy/policy_external/test/include/policy/driver_dbms.h
index 82d0f535a6..e438c87b03 100644
--- a/src/components/policy/policy_premium/test/include/policy/driver_dbms.h
+++ b/src/components/policy/policy_external/test/include/policy/driver_dbms.h
@@ -29,8 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_DRIVER_DBMS_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_DRIVER_DBMS_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_DRIVER_DBMS_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_DRIVER_DBMS_H_
 
 #ifdef __QNX__
 #include <qdb/qdb.h>
@@ -156,4 +156,4 @@ class DBMS {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_DRIVER_DBMS_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_DRIVER_DBMS_H_
diff --git a/src/components/policy/policy_premium/test/include/policy/mock_cache_manager.h b/src/components/policy/policy_external/test/include/policy/mock_cache_manager.h
index 648b56b0b9..518209d8fc 100644
--- a/src/components/policy/policy_premium/test/include/policy/mock_cache_manager.h
+++ b/src/components/policy/policy_external/test/include/policy/mock_cache_manager.h
@@ -29,8 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_CACHE_MANAGER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_CACHE_MANAGER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_CACHE_MANAGER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_CACHE_MANAGER_H_
 
 #include <string>
 #include <vector>
@@ -237,4 +237,4 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_CACHE_MANAGER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_CACHE_MANAGER_H_
diff --git a/src/components/policy/policy_premium/test/include/policy/mock_pt_ext_representation.h b/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h
index 449f55e69f..2dda69bd73 100644
--- a/src/components/policy/policy_premium/test/include/policy/mock_pt_ext_representation.h
+++ b/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_PT_EXT_REPRESENTATION_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_PT_EXT_REPRESENTATION_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_PT_EXT_REPRESENTATION_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_PT_EXT_REPRESENTATION_H_
 
 #include <string>
 #include <vector>
@@ -143,4 +143,4 @@ class MockPTExtRepresentation : public MockPTRepresentation,
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_PT_EXT_REPRESENTATION_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_PT_EXT_REPRESENTATION_H_
diff --git a/src/components/policy/policy_premium/test/include/policy/mock_pt_representation.h b/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h
index 1ea1de7537..995c63ed20 100644
--- a/src/components/policy/policy_premium/test/include/policy/mock_pt_representation.h
+++ b/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_PT_REPRESENTATION_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_PT_REPRESENTATION_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_PT_REPRESENTATION_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_PT_REPRESENTATION_H_
 
 #include <string>
 #include <vector>
@@ -106,4 +106,4 @@ class MockPTRepresentation : virtual public ::policy::PTRepresentation {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_PT_REPRESENTATION_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_PT_REPRESENTATION_H_
diff --git a/src/components/policy/policy_premium/test/include/policy/mock_update_status_manager.h b/src/components/policy/policy_external/test/include/policy/mock_update_status_manager.h
index 467e1fbea8..f753d4d1d9 100644
--- a/src/components/policy/policy_premium/test/include/policy/mock_update_status_manager.h
+++ b/src/components/policy/policy_external/test/include/policy/mock_update_status_manager.h
@@ -29,8 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_UPDATE_STATUS_MANAGER_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_UPDATE_STATUS_MANAGER_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_UPDATE_STATUS_MANAGER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_UPDATE_STATUS_MANAGER_H_
 
 #include "gmock/gmock.h"
 
@@ -58,4 +58,4 @@ class MockUpdateStatusManager : public ::policy::UpdateStatusManager {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_MOCK_UPDATE_STATUS_MANAGER_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_MOCK_UPDATE_STATUS_MANAGER_H_
diff --git a/src/components/policy/policy_premium/test/include/policy/policy_manager_impl_test_base.h b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
index e29391eb3b..e0fc308cbc 100644
--- a/src/components/policy/policy_premium/test/include/policy/policy_manager_impl_test_base.h
+++ b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
@@ -29,8 +29,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
-#define SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
 
 #include <string>
 #include <vector>
@@ -242,4 +242,4 @@ class PolicyManagerImplTest_RequestTypes : public ::testing::Test {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_POLICY_POLICY_PREMIUM_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
diff --git a/src/components/policy/policy_premium/test/json/PTU.json b/src/components/policy/policy_external/test/json/PTU.json
index dc53722243..dc53722243 100644
--- a/src/components/policy/policy_premium/test/json/PTU.json
+++ b/src/components/policy/policy_external/test/json/PTU.json
diff --git a/src/components/policy/policy_premium/test/json/PTU2.json b/src/components/policy/policy_external/test/json/PTU2.json
index fead05adab..fead05adab 100644
--- a/src/components/policy/policy_premium/test/json/PTU2.json
+++ b/src/components/policy/policy_external/test/json/PTU2.json
diff --git a/src/components/policy/policy_premium/test/json/PTU3.json b/src/components/policy/policy_external/test/json/PTU3.json
index cc4859ea21..cc4859ea21 100644
--- a/src/components/policy/policy_premium/test/json/PTU3.json
+++ b/src/components/policy/policy_external/test/json/PTU3.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_default_app.json b/src/components/policy/policy_external/test/json/PTU_default_app.json
index 833d46316a..833d46316a 100644
--- a/src/components/policy/policy_premium/test/json/PTU_default_app.json
+++ b/src/components/policy/policy_external/test/json/PTU_default_app.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_default_app_app_invalid_values_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_app_invalid_values_RequestType_array.json
index 1e5b1c46a4..1e5b1c46a4 100644
--- a/src/components/policy/policy_premium/test/json/PTU_default_app_app_invalid_values_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_default_app_app_invalid_values_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_default_app_empty_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_empty_RequestType_array.json
index 76365ee4bb..76365ee4bb 100644
--- a/src/components/policy/policy_premium/test/json/PTU_default_app_empty_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_default_app_empty_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_default_app_omitted_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_omitted_RequestType_array.json
index b380fa2de5..b380fa2de5 100644
--- a/src/components/policy/policy_premium/test/json/PTU_default_app_omitted_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_default_app_omitted_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_default_app_one_invalid_value_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_one_invalid_value_RequestType_array.json
index b8793b6cdc..b8793b6cdc 100644
--- a/src/components/policy/policy_premium/test/json/PTU_default_app_one_invalid_value_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_default_app_one_invalid_value_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_functional_grouping.json b/src/components/policy/policy_external/test/json/PTU_functional_grouping.json
index 5a8837c0bc..5a8837c0bc 100644
--- a/src/components/policy/policy_premium/test/json/PTU_functional_grouping.json
+++ b/src/components/policy/policy_external/test/json/PTU_functional_grouping.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app.json
index 833d46316a..833d46316a 100644
--- a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app.json
+++ b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json
index 8a183b45d5..8a183b45d5 100644
--- a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json
index 6ffc42c3e4..6ffc42c3e4 100644
--- a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json
index 24d0871d18..24d0871d18 100644
--- a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json
index b674913268..b674913268 100644
--- a/src/components/policy/policy_premium/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_with_empty_requestType_array.json b/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json
index 7e0836a805..7e0836a805 100644
--- a/src/components/policy/policy_premium/test/json/PTU_with_empty_requestType_array.json
+++ b/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_with_invalid_requestType_between_correct.json b/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json
index a056c3ce9c..a056c3ce9c 100644
--- a/src/components/policy/policy_premium/test/json/PTU_with_invalid_requestType_between_correct.json
+++ b/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_with_one_invalid_requestType.json b/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json
index c7e0a727fe..c7e0a727fe 100644
--- a/src/components/policy/policy_premium/test/json/PTU_with_one_invalid_requestType.json
+++ b/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json
diff --git a/src/components/policy/policy_premium/test/json/PTU_without_requestType_field.json b/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json
index a96ef74bd1..a96ef74bd1 100644
--- a/src/components/policy/policy_premium/test/json/PTU_without_requestType_field.json
+++ b/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json
diff --git a/src/components/policy/policy_premium/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
index 4c1bf19005..4c1bf19005 100644
--- a/src/components/policy/policy_premium/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
+++ b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
diff --git a/src/components/policy/policy_premium/test/json/preloadedPT_with_invalid_default_requestType.json b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json
index 02801cc976..02801cc976 100644
--- a/src/components/policy/policy_premium/test/json/preloadedPT_with_invalid_default_requestType.json
+++ b/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json
diff --git a/src/components/policy/policy_premium/test/json/preloadedPT_with_several_invalid_default_requestTypes.json b/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
index a9abeea5a2..a9abeea5a2 100644
--- a/src/components/policy/policy_premium/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
+++ b/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
diff --git a/src/components/policy/policy_premium/test/json/ptu2_requestType.json b/src/components/policy/policy_external/test/json/ptu2_requestType.json
index 50364397fd..50364397fd 100644
--- a/src/components/policy/policy_premium/test/json/ptu2_requestType.json
+++ b/src/components/policy/policy_external/test/json/ptu2_requestType.json
diff --git a/src/components/policy/policy_premium/test/json/ptu_requestType.json b/src/components/policy/policy_external/test/json/ptu_requestType.json
index d4c85d0d05..d4c85d0d05 100644
--- a/src/components/policy/policy_premium/test/json/ptu_requestType.json
+++ b/src/components/policy/policy_external/test/json/ptu_requestType.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_preloaded_pt.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json
index d6f34c12fc..d6f34c12fc 100644
--- a/src/components/policy/policy_premium/test/json/sdl_preloaded_pt.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_preloaded_pt1.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json
index 78c5f873d9..78c5f873d9 100644
--- a/src/components/policy/policy_premium/test/json/sdl_preloaded_pt1.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_preloaded_pt_send_location.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json
index 49f9a1da3a..49f9a1da3a 100644
--- a/src/components/policy/policy_premium/test/json/sdl_preloaded_pt_send_location.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_pt_first_update.json b/src/components/policy/policy_external/test/json/sdl_pt_first_update.json
index e6817da0d3..e6817da0d3 100644
--- a/src/components/policy/policy_premium/test/json/sdl_pt_first_update.json
+++ b/src/components/policy/policy_external/test/json/sdl_pt_first_update.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_pt_second_update.json b/src/components/policy/policy_external/test/json/sdl_pt_second_update.json
index d5f5f480f3..d5f5f480f3 100644
--- a/src/components/policy/policy_premium/test/json/sdl_pt_second_update.json
+++ b/src/components/policy/policy_external/test/json/sdl_pt_second_update.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_pt_update.json b/src/components/policy/policy_external/test/json/sdl_pt_update.json
index 5047d832dd..5047d832dd 100644
--- a/src/components/policy/policy_premium/test/json/sdl_pt_update.json
+++ b/src/components/policy/policy_external/test/json/sdl_pt_update.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_2_groups_have_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json
index 2983f07146..2983f07146 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_2_groups_have_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_2_groups_no_params_in1.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json
index a13edef669..a13edef669 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_2_groups_no_params_in1.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
index 29851341ba..29851341ba 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json
index 08dec59730..08dec59730 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location_all_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json
index 4ae5d9cc20..4ae5d9cc20 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location_all_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location_no_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json
index d4b52c6176..d4b52c6176 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location_no_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json
diff --git a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location_some_params.json b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json
index 0144900e31..0144900e31 100644
--- a/src/components/policy/policy_premium/test/json/sdl_update_pt_send_location_some_params.json
+++ b/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json
diff --git a/src/components/policy/policy_premium/test/json/valid_sdl_pt_update.json b/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json
index 56c728f104..56c728f104 100644
--- a/src/components/policy/policy_premium/test/json/valid_sdl_pt_update.json
+++ b/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json
diff --git a/src/components/policy/policy_premium/test/log4cxx.properties b/src/components/policy/policy_external/test/log4cxx.properties
index 1c09444986..1c09444986 100644
--- a/src/components/policy/policy_premium/test/log4cxx.properties
+++ b/src/components/policy/policy_external/test/log4cxx.properties
diff --git a/src/components/policy/policy_premium/test/policy_manager_impl_ptu_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
index 524aeeb7b6..524aeeb7b6 100644
--- a/src/components/policy/policy_premium/test/policy_manager_impl_ptu_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
diff --git a/src/components/policy/policy_premium/test/policy_manager_impl_snapshot_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc
index 54907ef6f2..54907ef6f2 100644
--- a/src/components/policy/policy_premium/test/policy_manager_impl_snapshot_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc
diff --git a/src/components/policy/policy_premium/test/policy_manager_impl_stress_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc
index 2f1cc5a9d3..2f1cc5a9d3 100644
--- a/src/components/policy/policy_premium/test/policy_manager_impl_stress_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc
diff --git a/src/components/policy/policy_premium/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
index 4eba4d3e1c..4eba4d3e1c 100644
--- a/src/components/policy/policy_premium/test/policy_manager_impl_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc
diff --git a/src/components/policy/policy_premium/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
index eceecac0b1..eceecac0b1 100644
--- a/src/components/policy/policy_premium/test/policy_manager_impl_test_base.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
diff --git a/src/components/policy/policy_premium/test/policy_manager_impl_user_consent_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc
index fc8f980660..fc8f980660 100644
--- a/src/components/policy/policy_premium/test/policy_manager_impl_user_consent_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc
diff --git a/src/components/policy/policy_premium/test/shared_library_test.cc b/src/components/policy/policy_external/test/shared_library_test.cc
index b7183a9085..b7183a9085 100644
--- a/src/components/policy/policy_premium/test/shared_library_test.cc
+++ b/src/components/policy/policy_external/test/shared_library_test.cc
diff --git a/src/components/policy/policy_premium/test/sql_pt_ext_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc
index 63cd26b84c..63cd26b84c 100644
--- a/src/components/policy/policy_premium/test/sql_pt_ext_representation_test.cc
+++ b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc
diff --git a/src/components/policy/policy_premium/test/sql_pt_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_representation_test.cc
index d106641f5a..d106641f5a 100644
--- a/src/components/policy/policy_premium/test/sql_pt_representation_test.cc
+++ b/src/components/policy/policy_external/test/sql_pt_representation_test.cc
diff --git a/src/components/policy/policy_premium/test/update_status_manager_test.cc b/src/components/policy/policy_external/test/update_status_manager_test.cc
index af5481ca38..af5481ca38 100644
--- a/src/components/policy/policy_premium/test/update_status_manager_test.cc
+++ b/src/components/policy/policy_external/test/update_status_manager_test.cc
diff --git a/tools/policy_table_validator/CMakeLists.txt b/tools/policy_table_validator/CMakeLists.txt
index 15767827a3..fcd753ef06 100644
--- a/tools/policy_table_validator/CMakeLists.txt
+++ b/tools/policy_table_validator/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(
 
   message(STATUS "use ${EXTENDED_POLICY} poicy")
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
-  include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_premium/include/)
+  include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_external/include/)
 else()
   include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_regular/include/)
 endif()