diff --git a/app/models/strain.js b/app/models/strain.js
index b202a78..3f20466 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -22,12 +22,6 @@ export default Model.extend({
   sortOrder          : attr('number'),
   canEdit            : attr('boolean'),
 
-  // TODO: move this to component/helper
-  strainNameMU: function() {
-    let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
-    return Ember.String.htmlSafe(`${this.get('strainName')}${type}`);
-  }.property('strainName', 'typeStrain').readOnly(),
-
   // TODO: move this to component/helper
   fullName: Ember.computed('species', 'strainName', function() {
     return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
diff --git a/app/pods/components/strain-name/template.hbs b/app/pods/components/strain-name/template.hbs
new file mode 100644
index 0000000..38822c5
--- /dev/null
+++ b/app/pods/components/strain-name/template.hbs
@@ -0,0 +1 @@
+{{strain.strainName}}{{{if strain.typeStrain '<sup>T</sup>' ''}}}
diff --git a/app/pods/protected/characteristics/show/measurements-table/template.hbs b/app/pods/protected/characteristics/show/measurements-table/template.hbs
index 8ee1a86..8c7e2cb 100644
--- a/app/pods/protected/characteristics/show/measurements-table/template.hbs
+++ b/app/pods/protected/characteristics/show/measurements-table/template.hbs
@@ -17,7 +17,7 @@
       <tr>
         <td>
           {{#link-to 'protected.strains.show' row.strain.id}}
-            {{{row.strain.strainNameMU}}}
+            {{strain-name strain=row.strain}}
           {{/link-to}}
         </td>
         <td>
diff --git a/app/pods/protected/species/index/species-table/template.hbs b/app/pods/protected/species/index/species-table/template.hbs
index f96f9cf..ab9d772 100644
--- a/app/pods/protected/species/index/species-table/template.hbs
+++ b/app/pods/protected/species/index/species-table/template.hbs
@@ -23,7 +23,7 @@
           {{#each species.strains as |strain index|}}
             {{if index ","}}
             {{#link-to 'protected.strains.show' strain.id}}
-              {{{strain.strainNameMU}}}
+              {{strain-name strain=strain}}
             {{/link-to}}
           {{/each}}
         </td>
diff --git a/app/pods/protected/species/show/species-card/template.hbs b/app/pods/protected/species/show/species-card/template.hbs
index fac8247..b4e753d 100644
--- a/app/pods/protected/species/show/species-card/template.hbs
+++ b/app/pods/protected/species/show/species-card/template.hbs
@@ -14,7 +14,7 @@
               {{#each species.strains as |strain index|}}
                 <li>
                   {{#link-to 'protected.strains.show' strain.id}}
-                    {{{strain.strainNameMU}}}
+                    {{strain-name strain=strain}}
                   {{/link-to}}
                 </li>
               {{/each}}
diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs
index 888b03e..f523d56 100644
--- a/app/pods/protected/species/species-form/template.hbs
+++ b/app/pods/protected/species/species-form/template.hbs
@@ -19,7 +19,7 @@
         {{#each strains as |strain index|}}
           {{if index ","}}
           {{#link-to 'protected.strains.show' strain.id}}
-            {{{strain.strainNameMU}}}
+            {{strain-name strain=strain}}
           {{/link-to}}
         {{/each}}
         {{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs
index 995326a..546d7c5 100644
--- a/app/pods/protected/strains/show/strain-card/template.hbs
+++ b/app/pods/protected/strains/show/strain-card/template.hbs
@@ -1,7 +1,7 @@
 <div class="span-1">
   <fieldset class="flakes-information-box">
     <legend>
-      {{strain.strainNameMU}}
+      {{strain-name strain=strain}}
     </legend>
 
     {{! ROW 1 }}