diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index 5676e902a8..d139f0f414 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -163,11 +163,11 @@ class MassController extends Controller
                 $journal->transaction_count = $journal->transactions()->count();
                 if (!is_null($sources->first())) {
                     $journal->source_account_id   = $sources->first()->id;
-                    $journal->source_account_name = $sources->first()->name;
+                    $journal->source_account_name = $sources->first()->editname;
                 }
                 if (!is_null($destinations->first())) {
                     $journal->destination_account_id   = $destinations->first()->id;
-                    $journal->destination_account_name = $destinations->first()->name;
+                    $journal->destination_account_name = $destinations->first()->editname;
                 }
             }
         );
@@ -178,7 +178,7 @@ class MassController extends Controller
 
         $journals = $filtered;
 
-        return view('transactions.mass-edit', compact('journals', 'subTitle', 'accountList'));
+        return view('transactions.mass.edit', compact('journals', 'subTitle', 'accountList'));
     }
 
     /**
diff --git a/public/js/ff/transactions/create-edit.js b/public/js/ff/transactions/create-edit.js
deleted file mode 100644
index 08b876979e..0000000000
--- a/public/js/ff/transactions/create-edit.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * create-edit.js
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-/** global: what */
-
-$(document).ready(function () {
-    "use strict";
-
-    // the destination account name is always an expense account name.
-    if ($('input[name="destination_account_name"]').length > 0) {
-        $.getJSON('json/expense-accounts').done(function (data) {
-            $('input[name="destination_account_name"]').typeahead({source: data});
-        });
-    }
-
-    // also for multi input
-    if ($('input[name="destination_account_name[]"]').length > 0) {
-        $.getJSON('json/expense-accounts').done(function (data) {
-            $('input[name="destination_account_name[]"]').typeahead({source: data});
-        });
-    }
-
-    if ($('input[name="tags"]').length > 0) {
-        $.getJSON('json/tags').done(function (data) {
-
-            var opt = {
-                typeahead: {
-                    source: data,
-                    afterSelect: function () {
-                        this.$element.val("");
-                    }
-                }
-            };
-            $('input[name="tags"]').tagsinput(
-                opt
-            );
-        });
-    }
-
-    // the source account name is always a revenue account name.
-    if ($('input[name="source_account_name"]').length > 0) {
-        $.getJSON('json/revenue-accounts').done(function (data) {
-            $('input[name="source_account_name"]').typeahead({source: data});
-        });
-    }
-    // also for multi-input:
-    if ($('input[name="source_account_name[]"]').length > 0) {
-        $.getJSON('json/revenue-accounts').done(function (data) {
-            $('input[name="source_account_name[]"]').typeahead({source: data});
-        });
-    }
-    // and for split:
-    if ($('input[name="journal_source_account_name"]').length > 0) {
-        $.getJSON('json/revenue-accounts').done(function (data) {
-            $('input[name="journal_source_account_name"]').typeahead({source: data});
-        });
-    }
-
-
-    if ($('input[name="description"]').length > 0 && !(typeof what === "undefined")) {
-        $.getJSON('json/transaction-journals/' + what).done(function (data) {
-            $('input[name="description"]').typeahead({source: data});
-        });
-    }
-    // also for multi input:
-    if ($('input[name="description[]"]').length > 0 && !(typeof what === "undefined")) {
-        $.getJSON('json/transaction-journals/' + what).done(function (data) {
-            $('input[name="description[]"]').typeahead({source: data});
-        });
-    }
-    // and for the (rare) journal_description:
-    if ($('input[name="journal_description"]').length > 0 && !(typeof what === "undefined")) {
-        $.getJSON('json/transaction-journals/' + what).done(function (data) {
-            $('input[name="journal_description"]').typeahead({source: data});
-        });
-    }
-
-    if ($('input[name="category"]').length > 0) {
-        $.getJSON('json/categories').done(function (data) {
-            $('input[name="category"]').typeahead({source: data});
-        });
-    }
-
-    // also for multi input:
-    if ($('input[name^="category["]').length > 0) {
-        $.getJSON('json/categories').done(function (data) {
-            $('input[name^="category["]').typeahead({source: data});
-        });
-    }
-
-
-});
\ No newline at end of file
diff --git a/public/js/ff/transactions/edit.js b/public/js/ff/transactions/edit.js
deleted file mode 100644
index ee5149b3b3..0000000000
--- a/public/js/ff/transactions/edit.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * edit.js
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-$(document).ready(function () {
-    "use strict";
-
-    // withdrawal specific fields
-    if (what == 'withdrawal') {
-
-        $.getJSON('json/expense-accounts').done(function (data) {
-            $('input[name="destination_account_name"]').typeahead({source: data});
-        });
-    }
-
-    // deposit specific fields:
-    if (what == 'deposit') {
-        $.getJSON('json/revenue-accounts').done(function (data) {
-            $('input[name="source_account_name"]').typeahead({source: data});
-        });
-    }
-
-    // tags are always present:
-    if ($('input[name="tags"]').length > 0) {
-        $.getJSON('json/tags').done(function (data) {
-
-            var opt = {
-                typeahead: {
-                    source: data,
-                    afterSelect: function () {
-                        this.$element.val("");
-                    }
-                }
-            };
-            $('input[name="tags"]').tagsinput(
-                opt
-            );
-        });
-    }
-
-    // description
-    $.getJSON('json/transaction-journals/' + what).done(function (data) {
-        $('input[name="description"]').typeahead({source: data});
-    });
-
-    // category (always there)
-    $.getJSON('json/categories').done(function (data) {
-        $('input[name="category"]').typeahead({source: data});
-    });
-
-});
diff --git a/public/js/ff/transactions/mass/edit.js b/public/js/ff/transactions/mass/edit.js
new file mode 100644
index 0000000000..436cf88a67
--- /dev/null
+++ b/public/js/ff/transactions/mass/edit.js
@@ -0,0 +1,32 @@
+/*
+ * edit.js
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+/** global: what */
+
+$(document).ready(function () {
+    "use strict";
+
+    // destination account names:
+    if ($('input[name^="destination_account_name["]').length > 0) {
+        console.log('multi dest account');
+        $.getJSON('json/expense-accounts').done(function (data) {
+            $('input[name^="destination_account_name["]').typeahead({source: data});
+        });
+    }
+
+    // source account name
+    if ($('input[name^="source_account_name["]').length > 0) {
+        $.getJSON('json/revenue-accounts').done(function (data) {
+            $('input[name^="source_account_name["]').typeahead({source: data});
+        });
+    }
+
+    $.getJSON('json/categories').done(function (data) {
+        $('input[name^="category["]').typeahead({source: data});
+    });
+});
\ No newline at end of file
diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js
index 83ef63d57d..159be4f745 100644
--- a/public/js/ff/transactions/split/edit.js
+++ b/public/js/ff/transactions/split/edit.js
@@ -7,7 +7,7 @@
  */
 
 
-/** global: originalSum, accounting */
+/** global: originalSum, accounting, what */
 
 var destAccounts = {};
 var srcAccounts = {};
diff --git a/resources/views/transactions/mass-edit.twig b/resources/views/transactions/mass/edit.twig
similarity index 97%
rename from resources/views/transactions/mass-edit.twig
rename to resources/views/transactions/mass/edit.twig
index 1399aea9d4..f4dfb503a9 100644
--- a/resources/views/transactions/mass-edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -101,6 +101,9 @@
     </form>
 {% endblock %}
 {% block scripts %}
+    <script type="text/javascript">
+        var what = "";
+    </script>
     <script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
-    <script type="text/javascript" src="js/ff/transactions/create-edit.js"></script>
+    <script type="text/javascript" src="js/ff/transactions/mass/edit.js"></script>
 {% endblock %}