diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index a7247b7705..ba4dc6d208 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -306,7 +306,7 @@ class RuleController extends Controller
         }
 
         // Return json response
-        $view = view('list.journals-tiny-tasker', ['transactions' => $matchingTransactions])->render();
+        $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render();
 
         return Response::json(['html' => $view, 'warning' => $warning]);
     }
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index bedb9ee721..40da0b960c 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -86,7 +86,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.journals-tasker' with {sorting:true, hideBills:true, hideBudgets: true, hideCategories: true} %}
+                    {% include 'list.journals' with {sorting:true, hideBills:true, hideBudgets: true, hideCategories: true} %}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar" aria-hidden="true"></i>
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 2b01b46c29..7e81359214 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -106,7 +106,7 @@
                     <h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.journals-tasker' %}
+                    {% include 'list.journals' %}
                 </div>
             </div>
         </div>
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index fd23bde560..c2311cb332 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -22,7 +22,7 @@
                     <h3 class="box-title">{{ subTitle }}</h3>
                 </div>
                 <div class="box-body ">
-                    {% include 'list.journals-tasker' with {'journals': journals,'hideBudgets': true} %}
+                    {% include 'list.journals' with {'journals': journals,'hideBudgets': true} %}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar" aria-hidden="true"></i>
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 3e598b1d6e..824efb1ce2 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -88,7 +88,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.journals-tasker' with {hideBudgets:true, hideBills:true} %}
+                    {% include 'list.journals' with {hideBudgets:true, hideBills:true} %}
                     {% if budgetLimit %}
                         <p>
                             <i class="fa fa-calendar" aria-hidden="true"></i>
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index c6ebc131f4..0037b77257 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -22,7 +22,7 @@
                     <h3 class="box-title">{{ subTitle }}</h3>
                 </div>
                 <div class="box-body ">
-                    {% include 'list.journals-tasker' with {'journals': journals, 'hideCategories':true} %}
+                    {% include 'list.journals' with {'journals': journals, 'hideCategories':true} %}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar" aria-hidden="true"></i>
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 186ad996de..9a1648d3da 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -65,7 +65,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.journals-tasker' with {hideCategories: true} %}
+                    {% include 'list.journals' with {hideCategories: true} %}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar" aria-hidden="true"></i>
diff --git a/resources/views/index.twig b/resources/views/index.twig
index 7dd28358b9..6cd8914de2 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -85,7 +85,7 @@
 
                     {% if data[0].count > 0 %}
                         <div class="box-body no-padding">
-                            {% include 'list.journals-tiny-tasker' with {'transactions': data[0],'account': data[1]} %}
+                            {% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
                         </div>
                     {% else %}
                         <div class="box-body">
diff --git a/resources/views/list/journals-tiny-tasker.twig b/resources/views/list/journals-tiny.twig
similarity index 100%
rename from resources/views/list/journals-tiny-tasker.twig
rename to resources/views/list/journals-tiny.twig
diff --git a/resources/views/list/journals-tasker.twig b/resources/views/list/journals.twig
similarity index 100%
rename from resources/views/list/journals-tasker.twig
rename to resources/views/list/journals.twig
diff --git a/resources/views/popup/list/journals-tasker.twig b/resources/views/popup/list/journals.twig
similarity index 100%
rename from resources/views/popup/list/journals-tasker.twig
rename to resources/views/popup/list/journals.twig
diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig
index 1f5bd820bb..426aab6d07 100644
--- a/resources/views/popup/report/balance-amount.twig
+++ b/resources/views/popup/report/balance-amount.twig
@@ -10,7 +10,7 @@
         <div class="modal-body">
             {% set hideSource = true %}
             {% set hideBudget = true %}
-            {% include 'popup/list/journals-tasker' %}
+            {% include 'popup/list/journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twig
index a4e6e49bc5..8f4f106b7e 100644
--- a/resources/views/popup/report/budget-spent-amount.twig
+++ b/resources/views/popup/report/budget-spent-amount.twig
@@ -9,7 +9,7 @@
         </div>
         <div class="modal-body">
             {% set hideBudget = true %}
-            {% include 'popup/list/journals-tasker' %}
+            {% include 'popup/list/journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig
index 7efcc01ad7..f5cd63d1c6 100644
--- a/resources/views/popup/report/category-entry.twig
+++ b/resources/views/popup/report/category-entry.twig
@@ -8,7 +8,7 @@
         </div>
         <div class="modal-body">
             {% set hideCategory = true %}
-            {% include 'popup/list/journals-tasker' %}
+            {% include 'popup/list/journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig
index 72a415de0b..46193a0eb2 100644
--- a/resources/views/popup/report/expense-entry.twig
+++ b/resources/views/popup/report/expense-entry.twig
@@ -8,7 +8,7 @@
         </div>
         <div class="modal-body">
             {% set hideDestination = true %}
-            {% include 'popup/list/journals-tasker' %}
+            {% include 'popup/list/journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index f32dc9e697..31a22e8f95 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -10,7 +10,7 @@
             {% set hideBudget = true %}
             {% set hideSource = true %}
             {% set accountPerspective = account %}
-            {% include 'popup/list/journals-tasker' %}
+            {% include 'popup/list/journals' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 9d0c59843f..01444e9212 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -62,7 +62,7 @@
                                     balance: auditData[account.id].endBalance|formatAmount
                                 })|raw }}
                             </p>
-                            {% include 'reports.partials.journals-audit-tasker'  with {'journals': auditData[account.id].journals,'account':account} %}
+                            {% include 'reports.partials.journals-audit'  with {'journals': auditData[account.id].journals,'account':account} %}
                             <p style="padding:10px;">
                                 {{ trans('firefly.audit_end_balance',
                                 {
diff --git a/resources/views/reports/partials/journals-audit-tasker.twig b/resources/views/reports/partials/journals-audit.twig
similarity index 100%
rename from resources/views/reports/partials/journals-audit-tasker.twig
rename to resources/views/reports/partials/journals-audit.twig
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 3538800b03..3fd021e679 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -105,7 +105,7 @@
                     </div>
                 </div>
                 <div class="box-body">
-                    {% include 'list/journals-tasker' %}
+                    {% include 'list/journals' %}
 
                     {% if periods %}
                         <p>
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index 4a72c0cb2f..65bfbf64e7 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -22,7 +22,7 @@
                     <h3 class="box-title">{{ subTitle }}</h3>
                 </div>
                 <div class="box-body ">
-                    {% include 'list.journals-tasker' with {'journals': journals} %}
+                    {% include 'list.journals' with {'journals': journals} %}
                     {% if periods.count > 0 %}
                         <p>
                             <i class="fa fa-calendar" aria-hidden="true"></i>