diff --git a/components/lib/avatar/Avatar.vue b/components/lib/avatar/Avatar.vue
index 6acf78df4..b65ad1cfb 100644
--- a/components/lib/avatar/Avatar.vue
+++ b/components/lib/avatar/Avatar.vue
@@ -1,10 +1,10 @@
 <template>
-    <div :class="cx('root')" :aria-labelledby="ariaLabelledby" :aria-label="ariaLabel" v-bind="ptm('root')" data-pc-name="avatar" data-pc-section="root">
+    <div :class="cx('root')" :aria-labelledby="ariaLabelledby" :aria-label="ariaLabel" v-bind="ptm('root')">
         <slot>
-            <span v-if="label" :class="cx('label')" v-bind="ptm('label')" data-pc-section="label">{{ label }}</span>
-            <component v-else-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" v-bind="ptm('icon')" data-pc-section="icon" />
-            <span v-else-if="icon" :class="cx('icon')" v-bind="ptm('icon')" data-pc-section="icon" />
-            <img v-else-if="image" :src="image" :alt="ariaLabel" @error="onError" v-bind="ptm('image')" data-pc-section="image" />
+            <span v-if="label" :class="cx('label')" v-bind="ptm('label')">{{ label }}</span>
+            <component v-else-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" v-bind="ptm('icon')" />
+            <span v-else-if="icon" :class="cx('icon')" v-bind="ptm('icon')" />
+            <img v-else-if="image" :src="image" :alt="ariaLabel" @error="onError" v-bind="ptm('image')" />
         </slot>
     </div>
 </template>
diff --git a/components/lib/card/Card.vue b/components/lib/card/Card.vue
index 8111a4c07..b7ebfc5c3 100755
--- a/components/lib/card/Card.vue
+++ b/components/lib/card/Card.vue
@@ -1,19 +1,19 @@
 <template>
-    <div :class="cx('root')" v-bind="ptm('root')" data-pc-name="card" data-pc-section="root">
-        <div v-if="$slots.header" :class="cx('header')" v-bind="ptm('header')" data-pc-section="header">
+    <div :class="cx('root')" v-bind="ptm('root')">
+        <div v-if="$slots.header" :class="cx('header')">
             <slot name="header"></slot>
         </div>
         <div :class="cx('body')" v-bind="ptm('body')" data-pc-section="body">
-            <div v-if="$slots.title" :class="cx('title')" v-bind="ptm('title')" data-pc-section="title">
+            <div v-if="$slots.title" :class="cx('title')">
                 <slot name="title"></slot>
             </div>
-            <div v-if="$slots.subtitle" :class="cx('subtitle')" v-bind="ptm('subtitle')" data-pc-section="subtitle">
+            <div v-if="$slots.subtitle" :class="cx('subtitle')" v-bind="ptm('subtitle')">
                 <slot name="subtitle"></slot>
             </div>
-            <div :class="cx('content')" v-bind="ptm('content')" data-pc-section="content">
+            <div :class="cx('content')" v-bind="ptm('content')">
                 <slot name="content"></slot>
             </div>
-            <div v-if="$slots.footer" :class="cx('footer')" v-bind="ptm('footer')" data-pc-section="footer">
+            <div v-if="$slots.footer" :class="cx('footer')">
                 <slot name="footer"></slot>
             </div>
         </div>
diff --git a/components/lib/divider/Divider.vue b/components/lib/divider/Divider.vue
index 3dd5b7bdc..ad5585cd7 100644
--- a/components/lib/divider/Divider.vue
+++ b/components/lib/divider/Divider.vue
@@ -1,6 +1,6 @@
 <template>
-    <div :class="cx('root')" role="separator" :aria-orientation="layout" v-bind="ptm('root')" data-pc-name="divider" data-pc-section="root">
-        <div v-if="$slots.default" :class="cx('content')" v-bind="ptm('content')" data-pc-name="content">
+    <div :class="cx('root')" role="separator" :aria-orientation="layout" v-bind="ptm('root')">
+        <div v-if="$slots.default" :class="cx('content')" v-bind="ptm('content')">
             <slot></slot>
         </div>
     </div>