diff --git a/addon/components/paper-card-title-media.hbs b/addon/components/paper-card-title-media.hbs
index eb1835447..bf78cde53 100644
--- a/addon/components/paper-card-title-media.hbs
+++ b/addon/components/paper-card-title-media.hbs
@@ -1,7 +1,9 @@
-{{#if (has-block)}}
-  <div class="md-media-{{this.size}}">
-    {{yield}}
-  </div>
-{{else}}
-  <img class="md-media-{{this.size}}" src={{@src}} alt={{@alt}} title={{@title}}>
-{{/if}}
\ No newline at end of file
+<md-card-title-media ...attributes>
+  {{#if (has-block)}}
+    <div class="md-media-{{this.size}}">
+      {{yield}}
+    </div>
+  {{else}}
+    <img class="md-media-{{this.size}}" src={{@src}} alt={{@alt}} title={{@title}}>
+  {{/if}}
+</md-card-title-media>
\ No newline at end of file
diff --git a/addon/components/paper-card-title-media.js b/addon/components/paper-card-title-media.js
index 3f050efef..b1ed747d2 100644
--- a/addon/components/paper-card-title-media.js
+++ b/addon/components/paper-card-title-media.js
@@ -1,4 +1,4 @@
-/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
+/* eslint-disable ember/no-classic-components */
 /**
  * @module ember-paper
  */
@@ -8,7 +8,7 @@ import Component from '@ember/component';
  * @class PaperCardTitleMedia
  * @extends Ember.Component
  */
-export default Component.extend({
-  tagName: 'md-card-title-media',
-  size: 'md',
-});
+export default class PaperCardTitleMedia extends Component {
+  tagName = '';
+  size = 'md';
+}
diff --git a/addon/components/paper-card-title-text.hbs b/addon/components/paper-card-title-text.hbs
index 99c80930b..8498d188d 100644
--- a/addon/components/paper-card-title-text.hbs
+++ b/addon/components/paper-card-title-text.hbs
@@ -1,4 +1,6 @@
-{{yield (hash
-  headline=(component "paper-card-header-headline")
-  subhead=(component "paper-card-header-subhead")
-)}}
\ No newline at end of file
+<md-card-title-text ...attributes>
+  {{yield (hash
+    headline=(component "paper-card-header-headline")
+    subhead=(component "paper-card-header-subhead")
+  )}}
+</md-card-title-text>
\ No newline at end of file
diff --git a/addon/components/paper-card-title-text.js b/addon/components/paper-card-title-text.js
index 30a5182c5..5aa1ee7aa 100644
--- a/addon/components/paper-card-title-text.js
+++ b/addon/components/paper-card-title-text.js
@@ -1,4 +1,4 @@
-/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
+/* eslint-disable ember/no-classic-components */
 /**
  * @module ember-paper
  */
@@ -8,6 +8,6 @@ import Component from '@ember/component';
  * @class PaperCardTitleText
  * @extends Ember.Component
  */
-export default Component.extend({
-  tagName: 'md-card-title-text',
-});
+export default class PaperCardTitleText extends Component {
+  tagName = '';
+}