diff --git a/AVInput/AVInput.config b/AVInput/AVInput.config
index ad7fb450db..00664c50b8 100644
--- a/AVInput/AVInput.config
+++ b/AVInput/AVInput.config
@@ -1,3 +1,3 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign com.comcast.AVInput)
+set (callsign org.rdk.AVInput)
diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp
index 3f487db0bf..e0bc7d8b01 100644
--- a/AVInput/AVInput.cpp
+++ b/AVInput/AVInput.cpp
@@ -22,7 +22,7 @@
 
 const short WPEFramework::Plugin::AVInput::API_VERSION_NUMBER_MAJOR = 1;
 const short WPEFramework::Plugin::AVInput::API_VERSION_NUMBER_MINOR = 0;
-const string WPEFramework::Plugin::AVInput::SERVICE_NAME = "com.comcast.AVInput";
+const string WPEFramework::Plugin::AVInput::SERVICE_NAME = "org.rdk.AVInput";
 //methods
 const string WPEFramework::Plugin::AVInput::METHOD_GET_API_VERSION_NUMBER = "getApiVersionNumber";
 const string WPEFramework::Plugin::AVInput::AVINPUT_METHOD_NUMBER_OF_INPUTS = "numberOfInputs";
@@ -32,7 +32,7 @@ const string WPEFramework::Plugin::AVInput::AVINPUT_METHOD_CONTENT_PROTECTED = "
 const string WPEFramework::Plugin::AVInput::AVINPUT_EVENT_ON_AV_INPUT_ACTIVE = "onAVInputActive";
 const string WPEFramework::Plugin::AVInput::AVINPUT_EVENT_ON_AV_INPUT_INACTIVE = "onAVInputInactive";
 
-#define SUBSCRIPTION_CALLSIGN "com.comcast.HdmiInput"
+#define SUBSCRIPTION_CALLSIGN "org.rdk.HdmiInput"
 #define SUBSCRIPTION_CALLSIGN_VER SUBSCRIPTION_CALLSIGN".1"
 #define SUBSCRIPTION_EVENT "onDevicesChanged"
 #define SERVER_DETAILS  "127.0.0.1:9998"
diff --git a/AVInput/README.md b/AVInput/README.md
index 11a13b9e99..5959d292e0 100644
--- a/AVInput/README.md
+++ b/AVInput/README.md
@@ -2,14 +2,14 @@
 # AVInput
 
 ## Versions
-`com.comcast.AVInput.1`
+`org.rdk.AVInput.1`
 
 ## Methods:
 ```
-curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "com.comcast.AVInput.1.getApiVersionNumber"}' http://127.0.0.1:9998/jsonrpc
-curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "com.comcast.AVInput.1.numberOfInputs"}' http://127.0.0.1:9998/jsonrpc
-curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "com.comcast.AVInput.1.currentVideoMode"}' http://127.0.0.1:9998/jsonrpc
-curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "com.comcast.AVInput.1.contentProtected"}' http://127.0.0.1:9998/jsonrpc
+curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "org.rdk.AVInput.1.getApiVersionNumber"}' http://127.0.0.1:9998/jsonrpc
+curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "org.rdk.AVInput.1.numberOfInputs"}' http://127.0.0.1:9998/jsonrpc
+curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "org.rdk.AVInput.1.currentVideoMode"}' http://127.0.0.1:9998/jsonrpc
+curl --header "Content-Type: application/json" --request POST --data '{"jsonrpc":"2.0","id":"3","method": "org.rdk.AVInput.1.contentProtected"}' http://127.0.0.1:9998/jsonrpc
 ```
 ## Responses
 ```
diff --git a/ContinueWatching/CMakeLists.txt b/ContinueWatching/CMakeLists.txt
index 8f2ce2b935..fb915f6267 100644
--- a/ContinueWatching/CMakeLists.txt
+++ b/ContinueWatching/CMakeLists.txt
@@ -32,7 +32,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
-target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins crypto sec_api rfcapi trower-base64)
+target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins crypto ${SECAPI_LIB} rfcapi trower-base64)
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 install(TARGETS ${MODULE_NAME}
diff --git a/FrameRate/FrameRate.config b/FrameRate/FrameRate.config
index 6ab112ffc4..c0a407c681 100644
--- a/FrameRate/FrameRate.config
+++ b/FrameRate/FrameRate.config
@@ -1,4 +1,4 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign "com.comcast.FrameRate")
+set (callsign "org.rdk.FrameRate")
 
diff --git a/FrameRate/README.md b/FrameRate/README.md
index 4abe16c481..034ced61ff 100644
--- a/FrameRate/README.md
+++ b/FrameRate/README.md
@@ -10,8 +10,8 @@ bitbake thunder-plugins
 -----------------
 Test:
 
-curl -d '{"jsonrpc":"2.0","id":"3","params": {"frequency":1000},"method": "com.comcast.FrameRate.1.setCollectionFrequency"}' http://127.0.0.1:9998/jsonrpc
-curl -d '{"jsonrpc":"2.0","id":"3","params": {"newFpsValue":60},"method": "com.comcast.FrameRate.1.updateFps"}' http://127.0.0.1:9998/jsonrpc
-curl -d '{"jsonrpc":"2.0","id":"3","params": {"newFpsValue":30},"method": "com.comcast.FrameRate.1.updateFps"}' http://127.0.0.1:9998/jsonrpc
-curl -d '{"jsonrpc":"2.0","id":"3","method": "com.comcast.FrameRate.1.startFpsCollection"}' http://127.0.0.1:9998/jsonrpc
-curl -d '{"jsonrpc":"2.0","id":"3","method": "com.comcast.FrameRate.1.stopFpsCollection"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","params": {"frequency":1000},"method": "org.rdk.FrameRate.1.setCollectionFrequency"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","params": {"newFpsValue":60},"method": "org.rdk.FrameRate.1.updateFps"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","params": {"newFpsValue":30},"method": "org.rdk.FrameRate.1.updateFps"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","method": "org.rdk.FrameRate.1.startFpsCollection"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","method": "org.rdk.FrameRate.1.stopFpsCollection"}' http://127.0.0.1:9998/jsonrpc
diff --git a/HdcpProfile/HdcpProfile.config b/HdcpProfile/HdcpProfile.config
index d7f8a5c4e7..925e670959 100644
--- a/HdcpProfile/HdcpProfile.config
+++ b/HdcpProfile/HdcpProfile.config
@@ -1,3 +1,3 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign "com.comcast.HdcpProfile")
+set (callsign "org.rdk.HdcpProfile")
diff --git a/HdmiCec/HdmiCec.config b/HdmiCec/HdmiCec.config
index fb9f5c62e9..1f348d752a 100644
--- a/HdmiCec/HdmiCec.config
+++ b/HdmiCec/HdmiCec.config
@@ -1,3 +1,3 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign "com.comcast.HdmiCec")
+set (callsign "org.rdk.HdmiCec")
diff --git a/HdmiInput/HdmiInput.config b/HdmiInput/HdmiInput.config
index 776cd25fb1..7f5d07d62d 100644
--- a/HdmiInput/HdmiInput.config
+++ b/HdmiInput/HdmiInput.config
@@ -1,3 +1,3 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign "com.comcast.HdmiInput")
+set (callsign "org.rdk.HdmiInput")
diff --git a/ScreenCapture/README.md b/ScreenCapture/README.md
index 8fd8ba2b1d..1823ead897 100644
--- a/ScreenCapture/README.md
+++ b/ScreenCapture/README.md
@@ -10,6 +10,6 @@ bitbake thunder-plugins
 -----------------
 Test:
 
-curl -d '{"jsonrpc":"2.0","id":"3","params": {"url":"http://10.0.0.233/upload.php"},"method": "com.comcast.ScreenCapture.1.uploadScreenCapture"}' http://127.0.0.1:9998/jsonrpc
-curl -d '{"jsonrpc":"2.0","id":"3","params": {"url":"http://10.0.0.233/cgi-bin/upload.cgi", "callGUID": "test_guid"},"method": "com.comcast.ScreenCapture.1.uploadScreenCapture"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","params": {"url":"http://10.0.0.233/upload.php"},"method": "org.rdk.ScreenCapture.1.uploadScreenCapture"}' http://127.0.0.1:9998/jsonrpc
+curl -d '{"jsonrpc":"2.0","id":"3","params": {"url":"http://10.0.0.233/cgi-bin/upload.cgi", "callGUID": "test_guid"},"method": "org.rdk.ScreenCapture.1.uploadScreenCapture"}' http://127.0.0.1:9998/jsonrpc
 
diff --git a/ScreenCapture/ScreenCapture.config b/ScreenCapture/ScreenCapture.config
index f30c209913..8398330f97 100644
--- a/ScreenCapture/ScreenCapture.config
+++ b/ScreenCapture/ScreenCapture.config
@@ -1,4 +1,4 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign "com.comcast.ScreenCapture")
+set (callsign "org.rdk.ScreenCapture")
 
diff --git a/StateObserver/StateObserver.cpp b/StateObserver/StateObserver.cpp
index 70311b12ee..8b3a43f1a4 100644
--- a/StateObserver/StateObserver.cpp
+++ b/StateObserver/StateObserver.cpp
@@ -42,7 +42,7 @@
 
 #define STATEOBSERVER_MAJOR_VERSION 1
 #define STATEOBSERVER_MINOR_VERSION 0
-#define DEBUG_INFO 1
+#define DEBUG_INFO 0
 
 namespace WPEFramework {
 
diff --git a/XCast/XCast.config b/XCast/XCast.config
index ea9d09e4fc..1116222f9c 100644
--- a/XCast/XCast.config
+++ b/XCast/XCast.config
@@ -1,3 +1,3 @@
 set (autostart false)
 set (preconditions Platform)
-set (callsign "com.comcast.Xcast")
+set (callsign "org.rdk.Xcast")