diff --git a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
index 77e472e..51bbdde 100644
--- a/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
+++ b/src/svelte-components/src/dialogs/ChangeHostnameDialog.svelte
@@ -64,12 +64,12 @@
 <Dialog
   bind:open
   scrimClickAction=""
-  aria-labelledby="simple-title"
-  aria-describedby="simple-content"
+  aria-labelledby="change-hostname-dialog-title"
+  aria-describedby="change-hostname-dialog-content"
 >
-  <Title id="simple-title">Change Hostname</Title>
+  <Title id="change-hostname-dialog-title">Change Hostname</Title>
 
-  <Content id="simple-content">
+  <Content id="change-hostname-dialog-content">
     <TextField
       bind:value={hostname}
       label="New Hostname"
diff --git a/src/svelte-components/src/dialogs/HomeMachineDialog.svelte b/src/svelte-components/src/dialogs/HomeMachineDialog.svelte
index 3dca1a6..d4c1f3e 100644
--- a/src/svelte-components/src/dialogs/HomeMachineDialog.svelte
+++ b/src/svelte-components/src/dialogs/HomeMachineDialog.svelte
@@ -8,12 +8,12 @@
 
 <Dialog
   bind:open
-  aria-labelledby="simple-title"
-  aria-describedby="simple-content"
+  aria-labelledby="home-machine-dialog-title"
+  aria-describedby="home-machine-dialog-content"
 >
-  <Title id="simple-title">Home Machine</Title>
+  <Title id="home-machine-dialog-title">Home Machine</Title>
 
-  <Content id="simple-content">Home the machine?</Content>
+  <Content id="home-machine-dialog-content">Home the machine?</Content>
 
   <Actions>
     <Button>
diff --git a/src/svelte-components/src/dialogs/MessageDialog.svelte b/src/svelte-components/src/dialogs/MessageDialog.svelte
index 81c5eb9..0cf3ea1 100644
--- a/src/svelte-components/src/dialogs/MessageDialog.svelte
+++ b/src/svelte-components/src/dialogs/MessageDialog.svelte
@@ -9,11 +9,11 @@
   bind:open
   scrimClickAction=""
   escapeKeyAction=""
-  aria-labelledby="simple-title"
-  aria-describedby="simple-content"
+  aria-labelledby="message-dialog-title"
+  aria-describedby="message-dialog-content"
 >
-  <Title id="simple-title">{title}</Title>
-  <Content id="simple-content">
+  <Title id="message-dialog-title">{title}</Title>
+  <Content id="message-dialog-content">
     <slot />
   </Content>
 </Dialog>
diff --git a/src/svelte-components/src/dialogs/ProbeDialog.svelte b/src/svelte-components/src/dialogs/ProbeDialog.svelte
index 74de934..3a36ac2 100644
--- a/src/svelte-components/src/dialogs/ProbeDialog.svelte
+++ b/src/svelte-components/src/dialogs/ProbeDialog.svelte
@@ -310,13 +310,13 @@
   bind:open
   class="probe-dialog"
   scrimClickAction=""
-  aria-labelledby="simple-title"
-  aria-describedby="simple-content"
+  aria-labelledby="probe-dialog-title"
+  aria-describedby="probe-dialog-content"
   surface$style="width: 700px; height: 400px; max-width: calc(100vw - 32px); overflow: visible;"
 >
-  <Title id="simple-title">Probing {probeType?.toUpperCase()}</Title>
+  <Title id="probe-dialog-title">Probing {probeType?.toUpperCase()}</Title>
 
-  <Content id="simple-content" style="overflow: visible;">
+  <Content id="probe-dialog-content" style="overflow: visible;">
     <div class="steps">
       <p><b>Step {steps.indexOf(currentStep) + 1} of {steps.length}</b></p>
       <ul>
@@ -402,7 +402,7 @@
   $light: #ddd;
 
   :global {
-    .mdc-dialog__content {
+    #probe-dialog-content {
       display: flex;
       flex-direction: row;
     }
diff --git a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
index 0fd78a0..4f02231 100644
--- a/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
+++ b/src/svelte-components/src/dialogs/ScreenRotationDialog.svelte
@@ -36,12 +36,12 @@
 <Dialog
   bind:open
   scrimClickAction=""
-  aria-labelledby="screen-rotation-title"
-  aria-describedby="screen-rotation-content"
+  aria-labelledby="screen-rotation-dialog-title"
+  aria-describedby="screen-rotation-dialog-content"
 >
-  <Title id="screen-rotation-title">Screen Rotation</Title>
+  <Title id="screen-rotation-dialog-title">Screen Rotation</Title>
 
-  <Content id="screen-rotation-content">
+  <Content id="screen-rotation-dialog-content">
     {#each options as option}
       <FormField>
         <Radio bind:group={value} value={option.value} />
@@ -68,7 +68,7 @@
 
 <style lang="scss">
   :global {
-    #screen-rotation-content {
+    #screen-rotation-dialog-content {
       display: flex;
       flex-direction: column;
     }
diff --git a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
index 447783a..78e2ae2 100644
--- a/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
+++ b/src/svelte-components/src/dialogs/WifiConnectionDialog.svelte
@@ -45,12 +45,12 @@
 <Dialog
   bind:open
   scrimClickAction=""
-  aria-labelledby="simple-title"
-  aria-describedby="simple-content"
+  aria-labelledby="wifi-connection-dialog-title"
+  aria-describedby="wifi-connection-dialog-content"
 >
-  <Title id="simple-title">{connectToOrDisconnectFrom} {network.Name}</Title>
+  <Title id="wifi-connection-dialog-title">{connectToOrDisconnectFrom} {network.Name}</Title>
 
-  <Content id="simple-content">
+  <Content id="wifi-connection-dialog-content">
     {#if needPassword}
       <TextField
         bind:value={password}