diff --git a/ACS-Call-Composite/Composite.tsx b/ACS-Call-Composite/Composite.tsx
index 48baf26..2161504 100644
--- a/ACS-Call-Composite/Composite.tsx
+++ b/ACS-Call-Composite/Composite.tsx
@@ -30,14 +30,17 @@ function Composite(props: CompositeProps): JSX.Element {
 
   useEffect(() => {
     const createAdapter = async (): Promise<void> => {
-      setCallAdapter(
+      try{setCallAdapter(
         await createAzureCommunicationCallAdapter({
           userId: { communicationUserId: props.userId },
           displayName: props.displayName,
           credential: new AzureCommunicationTokenCredential(props.token),
           locator: {groupId: props.groupId}
         })
-      );
+      )} catch {
+        console.error('Failed to create call adapter');
+        setCallAdapter(undefined);
+      };
     };
     if( credential != undefined && props.groupId != "") createAdapter();
   }, [credential]);
@@ -46,6 +49,9 @@ function Composite(props: CompositeProps): JSX.Element {
   if (credential === undefined) {
     return <h3>Failed to construct credential. Provided token is malformed.</h3>;
   }
+  if (callAdapter === undefined) {
+    return <h3>Failed to construct call adapter.</h3>;
+  }
   if (props.groupId === "") {
     return <h3>Provide a valid thread id</h3>;
   }
diff --git a/ACS-Call-Composite/ControlManifest.Input.xml b/ACS-Call-Composite/ControlManifest.Input.xml
index 6f6029b..153a347 100644
--- a/ACS-Call-Composite/ControlManifest.Input.xml
+++ b/ACS-Call-Composite/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest>
-  <control namespace="Azure" constructor="ACSCallComposite" version="0.0.16" display-name-key="ACSCallComposite" description-key="ACSChatComposite description" control-type="standard" >
+  <control namespace="Azure" constructor="ACSCallUIComposite" version="0.0.1" display-name-key="ACSCallUIComposite" description-key="ACSChatComposite description" control-type="standard" >
     <!--external-service-usage node declares whether this 3rd party PCF control is using external service or not, if yes, this control will be considered as premium and please also add the external domain it is using.
     If it is not using any external service, please set the enabled="false" and DO NOT add any domain below. The "enabled" will be false by default.
     Example1:
diff --git a/ACS-Call-Composite/index.ts b/ACS-Call-Composite/index.ts
index c84fb23..9551c42 100644
--- a/ACS-Call-Composite/index.ts
+++ b/ACS-Call-Composite/index.ts
@@ -3,7 +3,7 @@ import Composite from './Composite'
 import React = require('react');
 import ReactDOM = require('react-dom');
 
-export class ACSCallComposite implements ComponentFramework.StandardControl<IInputs, IOutputs> {
+export class ACSCallUIComposite implements ComponentFramework.StandardControl<IInputs, IOutputs> {
 	private _container:HTMLDivElement;
 	private first:boolean;
 
diff --git a/ACS-Chat-Composite/ControlManifest.Input.xml b/ACS-Chat-Composite/ControlManifest.Input.xml
index d8a0cbd..3e7611e 100644
--- a/ACS-Chat-Composite/ControlManifest.Input.xml
+++ b/ACS-Chat-Composite/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest>
-  <control namespace="Azure" constructor="ACSChatComposite" version="0.0.16" display-name-key="ACSChatComposite" description-key="ACSChatComposite description" control-type="standard" >
+  <control namespace="Azure" constructor="ACSChatUIComposite" version="0.0.1" display-name-key="ACSChatUIComposite" description-key="ACSChatComposite description" control-type="standard" >
     <!--external-service-usage node declares whether this 3rd party PCF control is using external service or not, if yes, this control will be considered as premium and please also add the external domain it is using.
     If it is not using any external service, please set the enabled="false" and DO NOT add any domain below. The "enabled" will be false by default.
     Example1:
diff --git a/ACS-Chat-Composite/index.ts b/ACS-Chat-Composite/index.ts
index 3655c21..869f880 100644
--- a/ACS-Chat-Composite/index.ts
+++ b/ACS-Chat-Composite/index.ts
@@ -3,7 +3,7 @@ import Composite from './Composite'
 import React = require('react');
 import ReactDOM = require('react-dom');
 
-export class ACSChatComposite implements ComponentFramework.StandardControl<IInputs, IOutputs> {
+export class ACSChatUIComposite implements ComponentFramework.StandardControl<IInputs, IOutputs> {
 	private _container:HTMLDivElement;
 	private first:boolean;
 
diff --git a/Solutions/src/Other/Solution.xml b/Solutions/src/Other/Solution.xml
index b576fb9..f2ecd22 100644
--- a/Solutions/src/Other/Solution.xml
+++ b/Solutions/src/Other/Solution.xml
@@ -2,7 +2,7 @@
 <ImportExportXml version="9.1.0.643" SolutionPackageVersion="9.1" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <SolutionManifest>
     <!-- Unique Name of Cds Solution-->
-    <UniqueName>ACS UI Library</UniqueName>
+    <UniqueName>ACS_UI_Library</UniqueName>
     <LocalizedNames>
       <!-- Localized Solution Name in language code -->
       <LocalizedName description="ACS UI Library solutions" languagecode="1033" />