diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py
index 209e6b7da..ea5869654 100644
--- a/netbox/users/forms/model_forms.py
+++ b/netbox/users/forms/model_forms.py
@@ -167,26 +167,25 @@ class UserForm(BootstrapMixin, forms.ModelForm):
 class GroupForm(BootstrapMixin, forms.ModelForm):
 
     fieldsets = (
-        ('User', ('username', 'first_name', 'last_name', 'email', )),
+        ('name', ),
     )
 
     class Meta:
-        model = NetBoxUser
+        model = NetBoxGroup
         fields = [
-            'username', 'first_name', 'last_name', 'email', 'groups',
-            'is_active', 'is_staff', 'is_superuser', 'last_login', 'date_joined',
+            'name',
         ]
 
 
 class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
 
     fieldsets = (
+        ('name', 'description', 'enabled'),
         ('User', ('username', 'first_name', 'last_name', 'email', )),
     )
 
     class Meta:
-        model = NetBoxUser
+        model = ObjectPermission
         fields = [
-            'username', 'first_name', 'last_name', 'email', 'groups',
-            'is_active', 'is_staff', 'is_superuser', 'last_login', 'date_joined',
+            'name', 'description', 'enabled',
         ]
diff --git a/netbox/users/urls.py b/netbox/users/urls.py
index 17e9b9685..caed08c45 100644
--- a/netbox/users/urls.py
+++ b/netbox/users/urls.py
@@ -20,19 +20,19 @@ urlpatterns = [
     path('users/<int:pk>/', include(get_model_urls('users', 'netboxuser'))),
 
     # Groups
-    path('groups/', views.NetBoxUserListView.as_view(), name='netboxgroup_list'),
-    path('groups/add/', views.NetBoxUserEditView.as_view(), name='netboxgroup_add'),
-    path('groups/import/', views.NetBoxUserBulkImportView.as_view(), name='netboxgroup_import'),
-    path('groups/edit/', views.NetBoxUserBulkEditView.as_view(), name='netboxgroup_bulk_edit'),
-    path('groups/delete/', views.NetBoxUserBulkDeleteView.as_view(), name='netboxgroup_bulk_delete'),
+    path('groups/', views.NetBoxGroupListView.as_view(), name='netboxgroup_list'),
+    path('groups/add/', views.NetBoxGroupEditView.as_view(), name='netboxgroup_add'),
+    path('groups/import/', views.NetBoxGroupBulkImportView.as_view(), name='netboxgroup_import'),
+    path('groups/edit/', views.NetBoxGroupBulkEditView.as_view(), name='netboxgroup_bulk_edit'),
+    path('groups/delete/', views.NetBoxGroupBulkDeleteView.as_view(), name='netboxgroup_bulk_delete'),
     path('groups/<int:pk>/', include(get_model_urls('users', 'netboxgroup'))),
 
     # Permissions
-    path('permissions/', views.NetBoxUserListView.as_view(), name='objectpermission_list'),
-    path('permissions/add/', views.NetBoxUserEditView.as_view(), name='objectpermission_add'),
-    path('permissions/import/', views.NetBoxUserBulkImportView.as_view(), name='objectpermission_import'),
-    path('permissions/edit/', views.NetBoxUserBulkEditView.as_view(), name='objectpermission_bulk_edit'),
-    path('permissions/delete/', views.NetBoxUserBulkDeleteView.as_view(), name='objectpermission_bulk_delete'),
+    path('permissions/', views.ObjectPermissionListView.as_view(), name='objectpermission_list'),
+    path('permissions/add/', views.ObjectPermissionEditView.as_view(), name='objectpermission_add'),
+    path('permissions/import/', views.ObjectPermissionBulkImportView.as_view(), name='objectpermission_import'),
+    path('permissions/edit/', views.ObjectPermissionBulkEditView.as_view(), name='objectpermission_bulk_edit'),
+    path('permissions/delete/', views.ObjectPermissionBulkDeleteView.as_view(), name='objectpermission_bulk_delete'),
     path('permissions/<int:pk>/', include(get_model_urls('users', 'objectpermission'))),
 
     # API tokens