diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 9e6ee8a9..5191bf41 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -184,7 +184,7 @@
inputwebsocket.war
outputwebsocket.war
outputui.war
- secured-outputui.war
+ secured-websocket.war
diff --git a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
index 40548373..56870d68 100644
--- a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
+++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
@@ -17,13 +17,13 @@
#
#issuer of the JWT
-iss=CDMF_DEFAULT_IDP
+iss=iot_default
TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token
#audience of JWT claim
#comma seperated values
-aud=JwtIdentityAudience
+aud=wso2.org/products/iot
#expiration time of JWT (number of minutes from the current time)
exp=1000
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 0cac429d..321c76a5 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -839,7 +839,7 @@
${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers
true
@@ -1153,7 +1153,7 @@
${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers
true
diff --git a/modules/core/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
similarity index 93%
rename from modules/core/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
rename to modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
index 8109ae92..07b7f035 100644
--- a/modules/core/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
+++ b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
@@ -17,10 +17,10 @@
-->
- CDMF_DEFAULT_IDP
- CDMF_DEFAULT_IDP
+ iot_default
+ iot_default
- JwtIdentityAudience
+ wso2.org/products/iot
true