diff --git a/app/models/strain.js b/app/models/strain.js
index cf0fe3a..b5313c3 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -16,13 +16,14 @@ export default DS.Model.extend({
   updatedBy: DS.attr('number'),
   deletedBy: DS.attr('number'),
   totalMeasurements: DS.attr('number'),
+  strainNameMU: function() {
+    let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
+    return `${this.get('strainName')}${type}`;
+  }.property('strainName', 'typeStrain').readOnly(),
   fullName: function() {
     return `${this.get('species.speciesName')} (strain ${this.get('strainName')})`;
   }.property('species', 'strainName').readOnly(),
   fullNameMU: function() {
-    let species = `<em>${this.get('species.speciesName')}</em>`,
-      type = this.get('typeStrain') ? '<sup>T</sup>' : '',
-      strain = `(strain ${this.get('strainName')}${type})`;
-    return `${species} ${strain}`;
-  }.property('species', 'strainName').readOnly(),
+    return `<em>${this.get('species')}</em> ${this.get('strainNameMU')}`;
+  }.property('species', 'strainNameMU').readOnly(),
 });
diff --git a/app/pods/components/species-details/template.hbs b/app/pods/components/species-details/template.hbs
index 756a6a0..813ada2 100644
--- a/app/pods/components/species-details/template.hbs
+++ b/app/pods/components/species-details/template.hbs
@@ -18,7 +18,7 @@
           {{#each species.strains as |strain index|}}
             {{if index ","}}
             {{#link-to 'strains.show' strain.id}}
-              {{strain-name strain=strain}}
+              {{{strain.strainNameMU}}}
             {{/link-to}}
           {{/each}}
           {{#unless species.isNew}}
diff --git a/app/pods/components/species-index-row/template.hbs b/app/pods/components/species-index-row/template.hbs
index e3455a7..e86113a 100644
--- a/app/pods/components/species-index-row/template.hbs
+++ b/app/pods/components/species-index-row/template.hbs
@@ -9,7 +9,7 @@
   {{#each data.strains as |strain index|}}
     {{if index ","}}
     {{#link-to 'strains.show' strain.id}}
-      {{strain-name strain=strain}}
+      {{{strain.strainNameMU}}}
     {{/link-to}}
   {{/each}}
 </td>
diff --git a/app/pods/components/strain-name/component.js b/app/pods/components/strain-name/component.js
deleted file mode 100644
index ced0374..0000000
--- a/app/pods/components/strain-name/component.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-  tagName: 'span',
-});
diff --git a/app/pods/components/strain-name/template.hbs b/app/pods/components/strain-name/template.hbs
deleted file mode 100644
index 3082ce7..0000000
--- a/app/pods/components/strain-name/template.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{strain.strainName}}{{{if strain.typeStrain '<sup>T</sup>'}}}
diff --git a/tests/unit/pods/components/strain-name/component-test.js b/tests/unit/pods/components/strain-name/component-test.js
deleted file mode 100644
index 3874bf8..0000000
--- a/tests/unit/pods/components/strain-name/component-test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { moduleForComponent, test } from 'ember-qunit';
-
-moduleForComponent('strain-name', 'Unit | Component | strain name', {
-  // Specify the other units that are required for this test
-  // needs: ['component:foo', 'helper:bar'],
-  unit: true
-});
-
-test('it renders', function(assert) {
-  assert.expect(2);
-
-  // Creates the component instance
-  var component = this.subject();
-  assert.equal(component._state, 'preRender');
-
-  // Renders the component to the page
-  this.render();
-  assert.equal(component._state, 'inDOM');
-});