diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
index 65c788be49..60708bbd2d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
@@ -316,17 +316,17 @@
                         eventElement: "#tree [data-element='tree-item-Home'] a.umb-tree-item__label"
                     },
                     {
-                        element: "[data-element='editor-content'] [data-element='tab-Generic properties']",
-                        title: "Properties",
-                        content: "<p>Under the properties tab you will find the default information about a content item.</p>",
+                        element: "[data-element='editor-content'] [data-element='tab-_umb_infoTab']",
+                        title: "Info",
+                        content: "<p>Under the info tab you will find the default information about a content item.</p>",
                         event: "click"
                     },
                     {
-                        element: "[data-element='editor-content'] [data-element='property-_umb_urls']",
+                        element: "[data-element='editor-content'] [data-element='node-info-urls']",
                         title: "Open page",
                         content: "<p>Click the <b>Link to document</b> <i class='icon-out'></i> to view your page.</p><p>Tip: Click the preview button in the bottom right corner to preview changes without publishing them.</p>",
                         event: "click",
-                        eventElement: "[data-element='editor-content'] [data-element='property-_umb_urls'] a[target='_blank']"
+                        eventElement: "[data-element='editor-content'] [data-element='node-info-urls'] a[target='_blank']"
                     }
                 ]
             },
@@ -396,18 +396,18 @@
                         content: "<p>You will also find other details about the image, like the size.</p><p>You can add extra properties to an image by creating or editing the <b>Media types</b></p>"
                     },
                     {
-                        element: "[data-element='editor-media'] [data-element='tab-Generic properties']",
+                        element: "[data-element='editor-media'] [data-element='tab-_umb_infoTab']",
                         title: "Properties",
-                        content: "Like the content section you can also find default properties about the media item. You will find these under the properties tab.",
+                        content: "Like the content section you can also find default info about the media item. You will find this under the info tab.",
                         event: "click"
                     },
                     {
-                        element: "[data-element='editor-media'] [data-element='property-_umb_urls']",
+                        element: "[data-element='editor-media'] [data-element='node-info-urls']",
                         title: "Link to media",
                         content: "The path to the media item..."
                     },
                     {
-                        element: "[data-element='editor-media'] [data-element='property-_umb_updatedate']",
+                        element: "[data-element='editor-media'] [data-element='node-info-update-date']",
                         title: "Last edited",
                         content: "...and information about when the media item has been created and edited."
                     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index 240d9bb03d..a188d76347 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -2,7 +2,7 @@
     
     <div class="umb-package-details__main-content">
         
-        <umb-box>
+        <umb-box data-element="node-info-urls">
             <umb-box-header title-key="general_links"></umb-box-header>
             <umb-box-content class="block-form">
                 <ul class="nav nav-stacked" style="margin-bottom: 0;">
@@ -16,7 +16,7 @@
             </umb-box-content>
         </umb-box>
 
-        <umb-box>
+        <umb-box data-element="node-info-history">
             <umb-box-header title-key="general_history"></umb-box-header>
             <umb-box-content class="block-form">
                 
@@ -81,7 +81,7 @@
     </div>
 
     <div class="umb-package-details__sidebar">
-        <umb-box>
+        <umb-box data-element="node-info-scheduled-publishing">
             <umb-box-header title-key="general_scheduledPublishing"></umb-box-header>
             <umb-box-content class="block-form">
 
@@ -91,6 +91,7 @@
                         
 
                         <umb-date-time-picker
+                            data-element="node-info-publish"
                             options="datePickerConfig"
                             on-change="datePickerChange(event, 'publish')">
                             
@@ -122,6 +123,7 @@
 
                     <div class="flex items-center flex-column">
                         <umb-date-time-picker
+                            data-element="node-info-unpublish"
                             options="datePickerConfig"
                             on-change="datePickerChange(event, 'unpublish')">
 
@@ -153,15 +155,15 @@
 
             </umb-box-content>
         </umb-box>
-        <umb-box>
+        <umb-box data-element="node-info-general">
             <umb-box-header title-key="general_general"></umb-box-header>
             <umb-box-content class="block-form">
                 
-                <umb-control-group label="@template_createdDate">
+                <umb-control-group data-element="node-info-create-date" label="@template_createdDate">
                     {{node.createDate | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }}
                 </umb-control-group>
 
-                <umb-control-group label="@content_documentType">
+                <umb-control-group data-element="node-info-document-type" label="@content_documentType">
                     <umb-node-preview
                         style="max-width: 100%; margin-bottom: 0;"
                         icon="documentType.icon"
@@ -171,7 +173,7 @@
                     </umb-node-preview>
                 </umb-control-group>
 
-                <umb-control-group label="@template_template">
+                <umb-control-group data-element="node-info-template" label="@template_template">
                     <select
                         class="input-block-level"
                         ng-model="node.template"
@@ -181,7 +183,7 @@
                     </select>
                 </umb-control-group>
 
-                <umb-control-group label="Id">
+                <umb-control-group data-element="node-info-id" label="Id">
                     <div>{{ node.id }}</div>
                     <small>{{ node.key }}</small>
                 </umb-control-group>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 4b33e72d11..0bd9762e4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -1,6 +1,6 @@
 <div class="umb-package-details">
     <div class="umb-package-details__main-content">
-        <umb-box>
+        <umb-box data-element="node-info-urls">
             <umb-box-header title-key="general_links"></umb-box-header>
             <umb-box-content class="block-form">
 
@@ -25,19 +25,19 @@
     </div>
 
     <div class="umb-package-details__sidebar">
-        <umb-box>
+        <umb-box data-element="node-info-general">
             <umb-box-header title-key="general_general"></umb-box-header>
             <umb-box-content class="block-form">
                 
-                <umb-control-group label="@content_createDate">
+                <umb-control-group data-element="node-info-create-date" label="@content_createDate">
                     {{node.createDate | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }}
                 </umb-control-group>
 
-                <umb-control-group label="@content_updateDate">
+                <umb-control-group data-element="node-info-update-date" label="@content_updateDate">
                     {{node.updateDate | amDateFormat:'MMMM Do YYYY, HH:mm'}}
                 </umb-control-group>
             
-                <umb-control-group label="@content_mediatype">
+                <umb-control-group data-element="node-info-media-type" label="@content_mediatype">
                     <umb-node-preview
                         style="max-width: 100%; margin-bottom: 0px;"
                         icon="mediaType.icon"
@@ -47,7 +47,7 @@
                     </umb-node-preview>
                 </umb-control-group>
 
-                <umb-control-group label="Id">
+                <umb-control-group data-element="node-info-id" label="Id">
                     <div>{{ node.id }}</div>
                     <small>{{ node.key }}</small>
                 </umb-control-group>