diff --git a/addon/components/ember-tbody/template.hbs b/addon/components/ember-tbody/template.hbs
index 9218300db..b09ed9c67 100644
--- a/addon/components/ember-tbody/template.hbs
+++ b/addon/components/ember-tbody/template.hbs
@@ -30,7 +30,7 @@
 
     as |api|
   }}
-    {{#if hasBlock}}
+    {{#if (has-block)}}
       {{yield (hash
         rowValue=api.rowValue
         rowMeta=api.rowMeta
diff --git a/addon/components/ember-td/template.hbs b/addon/components/ember-td/template.hbs
index 53a2bc0f9..7b943f07f 100644
--- a/addon/components/ember-td/template.hbs
+++ b/addon/components/ember-td/template.hbs
@@ -30,7 +30,7 @@
     {{/if}}
 
     <div class="et-cell-content">
-      {{#if hasBlock}}
+      {{#if (has-block)}}
         {{yield this.cellValue this.columnValue this.rowValue this.cellMeta this.columnMeta this.rowMeta this.rowsCount}}
       {{else}}
         {{this.cellValue}}
@@ -38,7 +38,7 @@
     </div>
   </div>
 {{else}}
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     {{yield this.cellValue this.columnValue this.rowValue this.cellMeta this.columnMeta this.rowMeta this.rowsCount}}
   {{else}}
     {{this.cellValue}}
diff --git a/addon/components/ember-tfoot/template.hbs b/addon/components/ember-tfoot/template.hbs
index 20b04ff23..e1e200f95 100644
--- a/addon/components/ember-tfoot/template.hbs
+++ b/addon/components/ember-tfoot/template.hbs
@@ -14,7 +14,7 @@
 
     as |api|
   }}
-    {{#if hasBlock}}
+    {{#if (has-block)}}
       {{yield (hash
         rowValue=api.rowValue
         rowMeta=api.rowMeta
diff --git a/addon/components/ember-th/sort-indicator/template.hbs b/addon/components/ember-th/sort-indicator/template.hbs
index 17ca3c518..8e21b5486 100644
--- a/addon/components/ember-th/sort-indicator/template.hbs
+++ b/addon/components/ember-th/sort-indicator/template.hbs
@@ -1,6 +1,6 @@
 {{#if this.isSorted}}
   <span data-test-sort-indicator class="et-sort-indicator {{if this.isSortedAsc 'is-ascending' 'is-descending'}}">
-    {{#if hasBlock}}
+    {{#if (has-block)}}
       {{yield this.columnMeta}}
     {{else}}
       {{#if this.isMultiSorted}}
@@ -12,4 +12,4 @@
 
 {{#if this.isSortable}}
   <button data-test-sort-toggle class="et-sort-toggle et-speech-only">Toggle Sort</button>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/addon/components/ember-th/template.hbs b/addon/components/ember-th/template.hbs
index 8c93bac32..09e1142e3 100644
--- a/addon/components/ember-th/template.hbs
+++ b/addon/components/ember-th/template.hbs
@@ -1,4 +1,4 @@
-{{#if hasBlock}}
+{{#if (has-block)}}
   {{yield this.columnValue this.columnMeta this.rowMeta}}
 {{else}}
   {{this.columnValue.name}}
diff --git a/addon/components/ember-thead/template.hbs b/addon/components/ember-thead/template.hbs
index dc61f6cb7..5f699f979 100644
--- a/addon/components/ember-thead/template.hbs
+++ b/addon/components/ember-thead/template.hbs
@@ -1,5 +1,5 @@
 {{#each this.wrappedRows as |api|}}
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     {{yield (hash
       cells=api.cells
       isHeader=api.isHeader
diff --git a/addon/components/ember-tr/template.hbs b/addon/components/ember-tr/template.hbs
index bd8551512..a219468d1 100644
--- a/addon/components/ember-tr/template.hbs
+++ b/addon/components/ember-tr/template.hbs
@@ -1,5 +1,5 @@
 {{#each this.cells as |api|}}
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     {{#if this.isHeader}}
       {{yield (hash
         columnValue=api.columnValue