diff --git a/demo/index.html b/demo/index.html
index 12fd8cc..6e27694 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -13,8 +13,8 @@
 		  <!-- Avatar -->
       <div class="avatar-wrapper margin:5px_0px margin-right:10px">
 				  <a class="avatar round" data-window_url="render.html" data-pass_collection="modules" data-pass_prefix="" data-pass_module_id="5dd010bccbc25f0cdb1a4d9f" data-pass_to="render" data-window_width="300px" data-window_height="375px" data-window_color="#229954">
-    				<span data-collection="users" data-module_id="" name="name" class="sessionUser_Id width:12px avatar-name">B</span>
-    				<span data-collection="users" data-module_id="" name="profile_image" class="sessionUser_Id avatar-image">
+    				<span collection="users" data-module_id="" name="name" class="sessionUser_Id width:12px avatar-name">B</span>
+    				<span collection="users" data-module_id="" name="profile_image" class="sessionUser_Id avatar-image">
     				  <img src="/_static/Velazquez.jpg" onerror="this.style.display='none'"/>
     				</span>
     			</a>
diff --git a/docs/index.html b/docs/index.html
index 39f5e90..ef572d1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,16 +14,16 @@
 
     <!-- CoCreate CSS CDN -->
     <link rel="stylesheet" href="https://cdn.cocreate.app/latest/CoCreate.min.css" type="text/css" />
-    <link rel="stylesheet" href="https://ws.cocreate.app/docs.css" data-collection="apples" data-document_id="6069ff5042ef8ff5175a5c8d" name="css" type="text/css" />
+    <link rel="stylesheet" href="https://ws.cocreate.app/docs.css" collection="apples" document_id="6069ff5042ef8ff5175a5c8d" name="css" type="text/css" />
 </head>
 
 <body>
 
-    <nav class="nav display:flex align-items:center background:whitesmoke padding-top:10px padding-bottom:10px" data-main_content_id="content" data-scroll="sticky-nav,hide-nav" data-scroll_up="10" data-scroll_down="10" data-collection="components" data-document_id="60395ef42b3ac232657040fd"
+    <nav class="nav display:flex align-items:center background:whitesmoke padding-top:10px padding-bottom:10px" data-main_content_id="content" data-scroll="sticky-nav,hide-nav" data-scroll_up="10" data-scroll_down="10" collection="components" document_id="60395ef42b3ac232657040fd"
         name="html">
     </nav>
     <sidenav id="menuL" class="cocreate-sidenav background:whitesmoke" data-main_content="content" sidenav-default_desktop="expanded" sidenav-default_tablet="offcanvas" sidenav-ontoggle_desktop="offcanvas" sidenav-ontoggle_tablet="expanded">
-        <menu data-collection="components" data-document_id="603717b07de7fb350ae9fec8" name="html"></menu>
+        <menu collection="components" document_id="603717b07de7fb350ae9fec8" name="html"></menu>
         <div class="resizeHandler"></div>
     </sidenav>
     <main class="padding-top:15px padding:15px@lg@xl" data-main_content_id="content" id="cocreate-parallax">
@@ -116,7 +116,7 @@ <h2 class="padding:5px_0px">Demo</h2>
                             <div class="svColumn">
 
                                 <div class="svPanel">
-                                    <div data-realtime="false" data-collection="modules" data-document_id="5eefe30952c6e94c75fb5e3f" name="html" id="7" class="codemirror min-width:300px">
+                                    <div realtime="false" collection="modules" document_id="5eefe30952c6e94c75fb5e3f" name="html" id="7" class="codemirror min-width:300px">
                                     </div>
                                 </div>
                                 <div class="svSplitter svHorizontal"> </div>
