diff --git a/netbox/templates/vpn/ipsecprofile.html b/netbox/templates/vpn/ipsecprofile.html
index 08fa3074e..c1172870f 100644
--- a/netbox/templates/vpn/ipsecprofile.html
+++ b/netbox/templates/vpn/ipsecprofile.html
@@ -63,10 +63,6 @@
                 </ul>
               </td>
             </tr>
-            <tr>
-              <th scope="row">{% trans "Pre-Shared Key" %}</th>
-              <td>{% checkmark object.ike_policy.preshared_key %}</td>
-            </tr>
           </table>
         </div>
       </div>
diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py
index e61993ddd..4c59fcadf 100644
--- a/netbox/vpn/forms/model_forms.py
+++ b/netbox/vpn/forms/model_forms.py
@@ -196,7 +196,7 @@ class TunnelCreateForm(TunnelForm):
                 tunnel=instance,
                 role=self.cleaned_data['termination2_role'],
                 termination=self.cleaned_data['termination2_termination'],
-                outside_ip=self.cleaned_data.get('termination1_outside_ip'),
+                outside_ip=self.cleaned_data.get('termination2_outside_ip'),
             )
 
         return instance
diff --git a/netbox/vpn/tables/tunnels.py b/netbox/vpn/tables/tunnels.py
index 4023607ff..9c4ba816d 100644
--- a/netbox/vpn/tables/tunnels.py
+++ b/netbox/vpn/tables/tunnels.py
@@ -54,18 +54,18 @@ class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):
     role = columns.ChoiceFieldColumn(
         verbose_name=_('Role')
     )
-    interface_parent = tables.Column(
-        accessor='interface__parent_object',
+    termination_parent = tables.Column(
+        accessor='termination__parent_object',
         linkify=True,
         orderable=False,
         verbose_name=_('Host')
     )
-    interface = tables.Column(
+    termination = tables.Column(
         verbose_name=_('Interface'),
         linkify=True
     )
     ip_addresses = tables.ManyToManyColumn(
-        accessor=tables.A('interface__ip_addresses'),
+        accessor=tables.A('termination__ip_addresses'),
         orderable=False,
         linkify_item=True,
         verbose_name=_('IP Addresses')
@@ -81,7 +81,9 @@ class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = TunnelTermination
         fields = (
-            'pk', 'id', 'tunnel', 'role', 'interface_parent', 'interface', 'ip_addresses', 'outside_ip', 'tags',
+            'pk', 'id', 'tunnel', 'role', 'termination_parent', 'termination', 'ip_addresses', 'outside_ip', 'tags',
             'created', 'last_updated',
         )
-        default_columns = ('pk', 'id', 'tunnel', 'role', 'interface_parent', 'interface', 'ip_addresses', 'outside_ip')
+        default_columns = (
+            'pk', 'id', 'tunnel', 'role', 'termination_parent', 'termination', 'ip_addresses', 'outside_ip',
+        )
diff --git a/netbox/vpn/urls.py b/netbox/vpn/urls.py
index 0e1b1664e..2bf684313 100644
--- a/netbox/vpn/urls.py
+++ b/netbox/vpn/urls.py
@@ -31,12 +31,12 @@ urlpatterns = [
     path('ike-proposals/<int:pk>/', include(get_model_urls('vpn', 'ikeproposal'))),
 
     # IKE policies
-    path('ike-policys/', views.IKEPolicyListView.as_view(), name='ikepolicy_list'),
-    path('ike-policys/add/', views.IKEPolicyEditView.as_view(), name='ikepolicy_add'),
-    path('ike-policys/import/', views.IKEPolicyBulkImportView.as_view(), name='ikepolicy_import'),
-    path('ike-policys/edit/', views.IKEPolicyBulkEditView.as_view(), name='ikepolicy_bulk_edit'),
-    path('ike-policys/delete/', views.IKEPolicyBulkDeleteView.as_view(), name='ikepolicy_bulk_delete'),
-    path('ike-policys/<int:pk>/', include(get_model_urls('vpn', 'ikepolicy'))),
+    path('ike-policies/', views.IKEPolicyListView.as_view(), name='ikepolicy_list'),
+    path('ike-policies/add/', views.IKEPolicyEditView.as_view(), name='ikepolicy_add'),
+    path('ike-policies/import/', views.IKEPolicyBulkImportView.as_view(), name='ikepolicy_import'),
+    path('ike-policies/edit/', views.IKEPolicyBulkEditView.as_view(), name='ikepolicy_bulk_edit'),
+    path('ike-policies/delete/', views.IKEPolicyBulkDeleteView.as_view(), name='ikepolicy_bulk_delete'),
+    path('ike-policies/<int:pk>/', include(get_model_urls('vpn', 'ikepolicy'))),
 
     # IPSec proposals
     path('ipsec-proposals/', views.IPSecProposalListView.as_view(), name='ipsecproposal_list'),
@@ -47,12 +47,12 @@ urlpatterns = [
     path('ipsec-proposals/<int:pk>/', include(get_model_urls('vpn', 'ipsecproposal'))),
 
     # IPSec policies
-    path('ipsec-policys/', views.IPSecPolicyListView.as_view(), name='ipsecpolicy_list'),
-    path('ipsec-policys/add/', views.IPSecPolicyEditView.as_view(), name='ipsecpolicy_add'),
-    path('ipsec-policys/import/', views.IPSecPolicyBulkImportView.as_view(), name='ipsecpolicy_import'),
-    path('ipsec-policys/edit/', views.IPSecPolicyBulkEditView.as_view(), name='ipsecpolicy_bulk_edit'),
-    path('ipsec-policys/delete/', views.IPSecPolicyBulkDeleteView.as_view(), name='ipsecpolicy_bulk_delete'),
-    path('ipsec-policys/<int:pk>/', include(get_model_urls('vpn', 'ipsecpolicy'))),
+    path('ipsec-policies/', views.IPSecPolicyListView.as_view(), name='ipsecpolicy_list'),
+    path('ipsec-policies/add/', views.IPSecPolicyEditView.as_view(), name='ipsecpolicy_add'),
+    path('ipsec-policies/import/', views.IPSecPolicyBulkImportView.as_view(), name='ipsecpolicy_import'),
+    path('ipsec-policies/edit/', views.IPSecPolicyBulkEditView.as_view(), name='ipsecpolicy_bulk_edit'),
+    path('ipsec-policies/delete/', views.IPSecPolicyBulkDeleteView.as_view(), name='ipsecpolicy_bulk_delete'),
+    path('ipsec-policies/<int:pk>/', include(get_model_urls('vpn', 'ipsecpolicy'))),
 
     # IPSec profiles
     path('ipsec-profiles/', views.IPSecProfileListView.as_view(), name='ipsecprofile_list'),