diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/ConnectionStringDialog.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/ConnectionStringDialog.razor
index 9711ea6c3..b87a721b6 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Devices/ConnectionStringDialog.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Devices/ConnectionStringDialog.razor
@@ -25,11 +25,11 @@
                                 <MudTextField @bind-Value="@Credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ProvisioningEndpoint))"/>
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">
-                                <MudText Style="text-decoration:underline"><b>Device Id</b></MudText>
+                                <MudText Style="text-decoration:underline"><b>Registration Id</b></MudText>
                                 <MudTextField @bind-Value="@Credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.RegistrationID))" />
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">
-                                <MudText Style="text-decoration:underline"><b>ScopeId</b></MudText>
+                                <MudText Style="text-decoration:underline"><b>Scope Id</b></MudText>
                                 <MudTextField @bind-Value="@Credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ScopeID))" />
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/ConnectionStringDialog.razor b/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/ConnectionStringDialog.razor
index 32b02ac5d..afab810e8 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/ConnectionStringDialog.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/ConnectionStringDialog.razor
@@ -25,11 +25,11 @@
                                 <MudTextField @bind-Value="@Credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ProvisioningEndpoint))"/>
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">
-                                <MudText Style="text-decoration:underline"><b>Device Id</b></MudText>
+                                <MudText Style="text-decoration:underline"><b>Registration Id</b></MudText>
                                 <MudTextField @bind-Value="@Credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.RegistrationID))" />
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">
-                                <MudText Style="text-decoration:underline"><b>ScopeId</b></MudText>
+                                <MudText Style="text-decoration:underline"><b>Scope Id</b></MudText>
                                 <MudTextField @bind-Value="@Credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ScopeID))" />
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">