diff --git a/Resources/Private/Assets/src/js/html/config/window.html b/Resources/Private/Assets/src/js/html/config/window.html
index 4bac72d..f69e470 100644
--- a/Resources/Private/Assets/src/js/html/config/window.html
+++ b/Resources/Private/Assets/src/js/html/config/window.html
@@ -1,4 +1,4 @@
-<div aria-describedby="cookieconsent:config" aria-label="cookieconsent" aria-live="polite" class="cc-window-config cc-type-extend" id="cookieconsent:config" role="dialog">
+<div aria-describedby="cookieconsent:config" aria-label="cookieconsent-dialog" aria-live="polite" class="cc-window-config cc-type-extend" id="cookieconsent:config" role="dialog">
     <div class="cc-config" >
         <div class="cc-config-header">
             <span>{{config-header}}</span>
diff --git a/Resources/Private/Assets/src/js/html/window.html b/Resources/Private/Assets/src/js/html/window.html
index 457af0f..8a7b5dc 100644
--- a/Resources/Private/Assets/src/js/html/window.html
+++ b/Resources/Private/Assets/src/js/html/window.html
@@ -1 +1 @@
-<div aria-describedby="cookieconsent:desc" aria-label="cookieconsent" aria-live="polite" class="cc-window {{classes}}" id="cookieconsent:window" role="dialog"></div>
\ No newline at end of file
+<div aria-describedby="cookieconsent:desc" aria-label="cookieconsent-dialog" aria-live="polite" class="cc-window {{classes}}" id="cookieconsent:window" role="dialog"></div>
\ No newline at end of file
diff --git a/Resources/Private/Partials/Theme/DPExtend.html b/Resources/Private/Partials/Theme/DPExtend.html
index 0347f9f..6f8d055 100644
--- a/Resources/Private/Partials/Theme/DPExtend.html
+++ b/Resources/Private/Partials/Theme/DPExtend.html
@@ -2,7 +2,7 @@
       xmlns:dp="http://typo3.org/ns/DirkPersky/DpCookieconsent/ViewHelpers"
       xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
 
-<div aria-describedby="cookieconsent:config" aria-label="cookieconsent" aria-live="polite" class="cc-window-config cc-type-extend" id="cookieconsent:config" role="dialog">
+<div aria-describedby="cookieconsent:config" aria-label="cookieconsent-dialog" aria-live="polite" class="cc-window-config cc-type-extend" id="cookieconsent:config" role="dialog">
     <div class="backdrop"></div>
     <div class="cc-config" id="cookieconsent:config">
         <div class="cc-config-header">
diff --git a/Resources/Public/JavaScript/dp_cookieconsent.js b/Resources/Public/JavaScript/dp_cookieconsent.js
index c98bf9c..56eb7e6 100644
--- a/Resources/Public/JavaScript/dp_cookieconsent.js
+++ b/Resources/Public/JavaScript/dp_cookieconsent.js
@@ -69,7 +69,7 @@
         </button>\r
     </div>\r
 </div>\r
-`,x='<div aria-describedby="cookieconsent:desc" aria-label="cookieconsent" aria-live="polite" class="cc-window {{classes}}" id="cookieconsent:window" role="dialog"></div>',E=`<div aria-describedby="cookieconsent:config" aria-label="cookieconsent" aria-live="polite" class="cc-window-config cc-type-extend" id="cookieconsent:config" role="dialog">\r
+`,x='<div aria-describedby="cookieconsent:desc" aria-label="cookieconsent-dialog" aria-live="polite" class="cc-window {{classes}}" id="cookieconsent:window" role="dialog"></div>',E=`<div aria-describedby="cookieconsent:config" aria-label="cookieconsent-dialog" aria-live="polite" class="cc-window-config cc-type-extend" id="cookieconsent:config" role="dialog">\r
     <div class="cc-config" >\r
         <div class="cc-config-header">\r
             <span>{{config-header}}</span>\r