diff --git a/resources/views/auth/lost-two-factor.twig b/resources/views/auth/lost-two-factor.twig
index dabf4dae0c..07089c0f5e 100644
--- a/resources/views/auth/lost-two-factor.twig
+++ b/resources/views/auth/lost-two-factor.twig
@@ -12,7 +12,7 @@
     <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
 
     {# favicons #}
-    {% include('v1.partials.favicons') %}
+    {% include('partials.favicons') %}
 
 </head>
 <body class="container">
diff --git a/resources/views/auth/register.twig b/resources/views/auth/register.twig
index 873870cf42..02a1e2d437 100644
--- a/resources/views/auth/register.twig
+++ b/resources/views/auth/register.twig
@@ -45,6 +45,6 @@
         <a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
     </div>
 
-    {% include 'v1.partials.password-modal' %}
+    {% include 'partials.password-modal' %}
 
 {% endblock %}
diff --git a/resources/views/form/non-selectable-amount.twig b/resources/views/form/non-selectable-amount.twig
index e9eb950ebf..06434ec050 100644
--- a/resources/views/form/non-selectable-amount.twig
+++ b/resources/views/form/non-selectable-amount.twig
@@ -6,6 +6,6 @@
             <span class="input-group-addon non-selectable-currency-symbol">{{ selectedCurrency.symbol }}</span>
             {{ Form.input('number', name, value, options) }}
         </div>
-        {% include 'v1.form.feedback' %}
+        {% include 'form.feedback' %}
     </div>
 </div>
diff --git a/resources/views/index.twig b/resources/views/index.twig
index 254bd66297..7f8d544df3 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -4,7 +4,7 @@
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
-    {% include 'v1.partials.boxes' %}
+    {% include 'partials.boxes' %}
     <div class="row">
         <div class="col-lg-8 col-md-12 col-sm-12">
             {# ACCOUNTS #}
@@ -65,7 +65,7 @@
 
                         {% if data.transactions|length > 0 %}
                             <div class="box-body no-padding">
-                                {% include 'v1.list.groups-tiny' with {'transactions': data.transactions,'account': data.account} %}
+                                {% include 'list.groups-tiny' with {'transactions': data.transactions,'account': data.account} %}
                             </div>
                         {% else %}
                             <div class="box-body">
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index 3c7e7db198..b7446ca25f 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -261,7 +261,7 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
-        var deleteAPIRoute = '{{ route('api.v1.data.destroy') }}';
+        var deleteAPIRoute = '{{ route('api.data.destroy') }}';
         var confirmText = '{{ trans('firefly.are_you_sure')|escape('js') }}';
         $(document).ready(function () {
             $('.confirm').on('click', function (e) {
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 08328174a7..5f6764f62c 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -61,7 +61,7 @@
                             balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
                         })|raw }}
                 </p>
-                {% include 'v1.reports.partials.journals-audit'  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;">
 
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 4e66394ae8..3877fa5278 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -13,7 +13,7 @@
     </div>
 
     {% if ruleGroups|length == 1 and ruleGroups[0].rules.count() == 0 %}
-    {% include 'v1.partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
+    {% include 'partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
     {# make FF ignore demo for now. #}
     {% set shownDemo = true %}
     {% endif %}
@@ -185,7 +185,7 @@
         </div>
     {% endfor %}
 
-    {% include 'v1.rules.partials.test-trigger-modal' %}
+    {% include 'rules.partials.test-trigger-modal' %}
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index ee4d6f9b5b..36a4c4d581 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -90,7 +90,7 @@
             </div>
         </div>
 
-        {% include 'v1.rules.partials.test-trigger-modal' %}
+        {% include 'rules.partials.test-trigger-modal' %}
 
         <div class="row">
             <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index f533768793..8ee724efbc 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -72,7 +72,7 @@
         </div>
     </div>
 
-    {% include 'v1.rules.partials.test-trigger-modal' %}
+    {% include 'rules.partials.test-trigger-modal' %}
 
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index 6540483763..31e623d4c6 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -81,7 +81,7 @@
                         <a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_transaction'|_ }}</a>
                     </div>
                     {# actual list #}
-                    {% include 'v1.list.groups' %}
+                    {% include 'list.groups' %}
                 </div>
                 <div class="box-footer">
                     {# links for other views #}
@@ -103,7 +103,7 @@
         {# boxes with info #}
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">
-                {% include 'v1.list.periods' %}
+                {% include 'list.periods' %}
             </div>
         {% endif %}
 
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 29542300b7..956865cd8f 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -391,7 +391,7 @@
                             <h3 class="box-title">{{ 'attachments'|_ }}</h3>
                         </div>
                         <div class="box-body no-padding">
-                            {% include 'v1.list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
+                            {% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
                         </div>
                     </div>
                 {% endif %}
@@ -426,7 +426,7 @@
 {% block scripts %}
     <script type="text/javascript" nonce="{{ JS_NONCE }}">
         var modalDialogURI = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}';
-        var acURI = '{{ route('api.v1.autocomplete.transactions-with-id') }}';
+        var acURI = '{{ route('api.autocomplete.transactions-with-id') }}';
         var groupURI = '{{ route('transactions.show',['%GROUP%']) }}';
         var cloneGroupUrl = '{{ route('transactions.clone') }}';
 
