From 05db151432b9a875edd3239722512fba033b76ea Mon Sep 17 00:00:00 2001
From: hellerve <veit@veitheller.de>
Date: Tue, 6 Aug 2019 17:58:36 +0200
Subject: [PATCH] all: incorporate feedback regarding unique naming

---
 ...y => 0015_modernize_unique_constraints.py} |  6 +-
 netbox/circuits/models.py                     |  4 +-
 ...y => 0070_modernize_unique_constraints.py} | 60 +++++++++----------
 netbox/dcim/models.py                         | 58 +++++++++---------
 ...y => 0019_modernize_unique_constraints.py} | 10 ++--
 netbox/extras/models.py                       |  8 +--
 ...y => 0025_modernize_unique_constraints.py} | 10 ++--
 netbox/ipam/models.py                         |  8 +--
 ...y => 0006_modernize_unique_constraints.py} |  4 +-
 netbox/secrets/models.py                      |  2 +-
 10 files changed, 85 insertions(+), 85 deletions(-)
 rename netbox/circuits/migrations/{0015_auto_20190526_1525.py => 0015_modernize_unique_constraints.py} (82%)
 rename netbox/dcim/migrations/{0070_auto_20190526_1525.py => 0070_modernize_unique_constraints.py} (79%)
 rename netbox/extras/migrations/{0019_auto_20190526_1525.py => 0019_modernize_unique_constraints.py} (78%)
 rename netbox/ipam/migrations/{0025_auto_20190526_1525.py => 0025_modernize_unique_constraints.py} (80%)
 rename netbox/secrets/migrations/{0006_auto_20190526_1525.py => 0006_modernize_unique_constraints.py} (80%)

diff --git a/netbox/circuits/migrations/0015_auto_20190526_1525.py b/netbox/circuits/migrations/0015_modernize_unique_constraints.py
similarity index 82%
rename from netbox/circuits/migrations/0015_auto_20190526_1525.py
rename to netbox/circuits/migrations/0015_modernize_unique_constraints.py
index 73c888fdc..873c12b93 100644
--- a/netbox/circuits/migrations/0015_auto_20190526_1525.py
+++ b/netbox/circuits/migrations/0015_modernize_unique_constraints.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-26 15:25
+# Generated by Django 2.2.4 on 2019-08-06 15:52
 
 from django.db import migrations, models
 
@@ -20,10 +20,10 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='circuit',
-            constraint=models.UniqueConstraint(fields=('provider', 'cid'), name='unique_provider_and_cid'),
+            constraint=models.UniqueConstraint(fields=('provider', 'cid'), name='circuit_provider_cid_key'),
         ),
         migrations.AddConstraint(
             model_name='circuittermination',
-            constraint=models.UniqueConstraint(fields=('circuit', 'term_side'), name='unique_circuit_and_termside'),
+            constraint=models.UniqueConstraint(fields=('circuit', 'term_side'), name='circuittermination_circuit_termside_key'),
         ),
     ]
diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 026ece1ad..4fc64d590 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -175,7 +175,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         ordering = ['provider', 'cid']
         constraints = [
             models.UniqueConstraint(
-                fields=['provider', 'cid'], name='unique_provider_and_cid'
+                fields=['provider', 'cid'], name='circuit_provider_cid_key'
             )
         ]
 
@@ -272,7 +272,7 @@ class CircuitTermination(CableTermination):
         constraints = [
             models.UniqueConstraint(
                 fields=['circuit', 'term_side'],
-                name='unique_circuit_and_termside'
+                name='circuittermination_circuit_termside_key'
             )
         ]
 
diff --git a/netbox/dcim/migrations/0070_auto_20190526_1525.py b/netbox/dcim/migrations/0070_modernize_unique_constraints.py
similarity index 79%
rename from netbox/dcim/migrations/0070_auto_20190526_1525.py
rename to netbox/dcim/migrations/0070_modernize_unique_constraints.py
index 4d2e1bb48..11524edaa 100644
--- a/netbox/dcim/migrations/0070_auto_20190526_1525.py
+++ b/netbox/dcim/migrations/0070_modernize_unique_constraints.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-26 15:25
+# Generated by Django 2.2.4 on 2019-08-06 15:52
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -111,118 +111,118 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='cable',
-            constraint=models.UniqueConstraint(fields=('termination_a_type', 'termination_a_id'), name='unique_terminations_a_to_b_on_cable'),
+            constraint=models.UniqueConstraint(fields=('termination_a_type', 'termination_a_id'), name='cable_terminationatype_terminationaid_key'),
         ),
         migrations.AddConstraint(
             model_name='cable',
-            constraint=models.UniqueConstraint(fields=('termination_b_type', 'termination_b_id'), name='unique_terminations_b_to_a_on_cable'),
+            constraint=models.UniqueConstraint(fields=('termination_b_type', 'termination_b_id'), name='cable_terminationbtype_terminationbid_key'),
         ),
         migrations.AddConstraint(
             model_name='consoleport',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_consoleport'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='consoleport_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='consoleporttemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_consoleporttemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='consoleporttemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='consoleserverport',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_consoleserverport'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='consoleserverport_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='consoleserverporttemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_consoleserverporttemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='consoleserverporttemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='device',
-            constraint=models.UniqueConstraint(fields=('rack', 'position', 'face'), name='unique_rack_and_position_and_face_on_device'),
+            constraint=models.UniqueConstraint(fields=('rack', 'position', 'face'), name='device_rack_position_face_key'),
         ),
         migrations.AddConstraint(
             model_name='device',
-            constraint=models.UniqueConstraint(fields=('virtual_chassis', 'vc_position'), name='unique_virtualchassis_and_vcpos_on_device'),
+            constraint=models.UniqueConstraint(fields=('virtual_chassis', 'vc_position'), name='device_virtualchassis_vcpos_key'),
         ),
         migrations.AddConstraint(
             model_name='devicebay',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_devicebay'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='devicebay_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='devicebaytemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_devicebaytemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='devicebaytemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='devicetype',
-            constraint=models.UniqueConstraint(fields=('manufacturer', 'model'), name='unique_manufacturer_and_model_on_devicetype'),
+            constraint=models.UniqueConstraint(fields=('manufacturer', 'model'), name='devicetype_manufacturer_model_key'),
         ),
         migrations.AddConstraint(
             model_name='devicetype',
-            constraint=models.UniqueConstraint(fields=('manufacturer', 'slug'), name='unique_manufacturer_and_slug_on_devicetype'),
+            constraint=models.UniqueConstraint(fields=('manufacturer', 'slug'), name='devicetype_manufacturer_slug_key'),
         ),
         migrations.AddConstraint(
             model_name='frontport',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_frontport'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='frontport_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='frontport',
-            constraint=models.UniqueConstraint(fields=('rear_port', 'rear_port_position'), name='unique_rearport_and_rearportpos_on_frontport'),
+            constraint=models.UniqueConstraint(fields=('rear_port', 'rear_port_position'), name='frontport_rearport_rearportpos_key'),
         ),
         migrations.AddConstraint(
             model_name='frontporttemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_frontporttemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='frontporttemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='frontporttemplate',
-            constraint=models.UniqueConstraint(fields=('rear_port', 'rear_port_position'), name='unique_rearport_and_rearportpos_on_frontporttemplate'),
+            constraint=models.UniqueConstraint(fields=('rear_port', 'rear_port_position'), name='frontporttemplate_rearport_rearportpos_key'),
         ),
         migrations.AddConstraint(
             model_name='interface',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_interface'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='interface_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='interfacetemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_interfacetemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='interfacetemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='inventoryitem',
-            constraint=models.UniqueConstraint(fields=('device', 'parent', 'name'), name='unique_device_and_parent_and_name_on_inventoryitem'),
+            constraint=models.UniqueConstraint(fields=('device', 'parent', 'name'), name='inventoryitem_device_parent_name_key'),
         ),
         migrations.AddConstraint(
             model_name='poweroutlet',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_poweroutlet'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='poweroutlet_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='poweroutlettemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_poweroutlettemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='poweroutlettemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='powerport',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_powerport'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='powerport_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='powerporttemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_powerporttemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='powerporttemplate_devicetype_name_key'),
         ),
         migrations.AddConstraint(
             model_name='rack',
-            constraint=models.UniqueConstraint(fields=('group', 'name'), name='unique_group_and_name_on_rack'),
+            constraint=models.UniqueConstraint(fields=('group', 'name'), name='rack_group_name_key'),
         ),
         migrations.AddConstraint(
             model_name='rack',
-            constraint=models.UniqueConstraint(fields=('group', 'facility_id'), name='unique_group_and_facility_on_rack'),
+            constraint=models.UniqueConstraint(fields=('group', 'facility_id'), name='rack_group_facility_key'),
         ),
         migrations.AddConstraint(
             model_name='rackgroup',
-            constraint=models.UniqueConstraint(fields=('site', 'name'), name='unique_site_and_name_on_rackgroup'),
+            constraint=models.UniqueConstraint(fields=('site', 'name'), name='rackgroup_site_name_key'),
         ),
         migrations.AddConstraint(
             model_name='rackgroup',
-            constraint=models.UniqueConstraint(fields=('site', 'slug'), name='unique_site_and_slug_on_rackgroup'),
+            constraint=models.UniqueConstraint(fields=('site', 'slug'), name='rackgroup_site_slug_key'),
         ),
         migrations.AddConstraint(
             model_name='rearport',
-            constraint=models.UniqueConstraint(fields=('device', 'name'), name='unique_device_and_name_on_rearport'),
+            constraint=models.UniqueConstraint(fields=('device', 'name'), name='rearport_device_name_key'),
         ),
         migrations.AddConstraint(
             model_name='rearporttemplate',
-            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='unique_devicetype_and_name_on_rearporttemplate'),
+            constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='rearporttemplate_devicetype_name_key'),
         ),
     ]
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 34fcf8873..0e65caf33 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -391,11 +391,11 @@ class RackGroup(ChangeLoggedModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['site', 'name'],
-                name='unique_site_and_name_on_rackgroup'
+                name='rackgroup_site_name_key'
             ),
             models.UniqueConstraint(
                 fields=['site', 'slug'],
-                name='unique_site_and_slug_on_rackgroup'
+                name='rackgroup_site_slug_key'
             )
         ]
 
@@ -562,11 +562,11 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['group', 'name'],
-                name='unique_group_and_name_on_rack'
+                name='rack_group_name_key'
             ),
             models.UniqueConstraint(
                 fields=['group', 'facility_id'],
-                name='unique_group_and_facility_on_rack'
+                name='rack_group_facility_key'
             )
         ]
 
@@ -934,11 +934,11 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['manufacturer', 'model'],
-                name='unique_manufacturer_and_model_on_devicetype'
+                name='devicetype_manufacturer_model_key'
             ),
             models.UniqueConstraint(
                 fields=['manufacturer', 'slug'],
-                name='unique_manufacturer_and_slug_on_devicetype'
+                name='devicetype_manufacturer_slug_key'
             )
 
         ]
@@ -1027,7 +1027,7 @@ class ConsolePortTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_consoleporttemplate'
+                name='consoleporttemplate_devicetype_name_key'
             )
         ]
 
@@ -1055,7 +1055,7 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_consoleserverporttemplate'
+                name='consoleserverporttemplate_devicetype_name_key'
             )
         ]
 
@@ -1095,7 +1095,7 @@ class PowerPortTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_powerporttemplate'
+                name='powerporttemplate_devicetype_name_key'
             )
         ]
 
@@ -1136,7 +1136,7 @@ class PowerOutletTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_poweroutlettemplate'
+                name='poweroutlettemplate_devicetype_name_key'
             )
         ]
 
@@ -1180,7 +1180,7 @@ class InterfaceTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_interfacetemplate'
+                name='interfacetemplate_devicetype_name_key'
             )
         ]
 
@@ -1236,11 +1236,11 @@ class FrontPortTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_frontporttemplate'
+                name='frontporttemplate_devicetype_name_key'
             ),
             models.UniqueConstraint(
                 fields=['rear_port', 'rear_port_position'],
-                name='unique_rearport_and_rearportpos_on_frontporttemplate'
+                name='frontporttemplate_rearport_rearportpos_key'
             )
         ]
 
@@ -1291,7 +1291,7 @@ class RearPortTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_rearporttemplate'
+                name='rearporttemplate_devicetype_name_key'
             )
         ]
 
@@ -1319,7 +1319,7 @@ class DeviceBayTemplate(ComponentTemplateModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device_type', 'name'],
-                name='unique_devicetype_and_name_on_devicebaytemplate'
+                name='devicebaytemplate_devicetype_name_key'
             )
         ]
 
@@ -1573,11 +1573,11 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['rack', 'position', 'face'],
-                name='unique_rack_and_position_and_face_on_device'
+                name='device_rack_position_face_key'
             ),
             models.UniqueConstraint(
                 fields=['virtual_chassis', 'vc_position'],
-                name='unique_virtualchassis_and_vcpos_on_device'
+                name='device_virtualchassis_vcpos_key'
             ),
         ]
         permissions = (
@@ -1879,7 +1879,7 @@ class ConsolePort(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_consoleport'
+                name='consoleport_device_name_key'
             )
         ]
 
@@ -1927,7 +1927,7 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_consoleserverport'
+                name='consoleserverport_device_name_key'
             )
         ]
 
@@ -2002,7 +2002,7 @@ class PowerPort(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_powerport'
+                name='powerport_device_name_key'
             )
         ]
 
@@ -2130,7 +2130,7 @@ class PowerOutlet(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_poweroutlet'
+                name='poweroutlet_device_name_key'
             )
         ]
 
@@ -2266,7 +2266,7 @@ class Interface(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_interface'
+                name='interface_device_name_key'
             )
         ]
 
@@ -2481,11 +2481,11 @@ class FrontPort(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_frontport'
+                name='frontport_device_name_key'
             ),
             models.UniqueConstraint(
                 fields=['rear_port', 'rear_port_position'],
-                name='unique_rearport_and_rearportpos_on_frontport'
+                name='frontport_rearport_rearportpos_key'
             )
         ]
 
@@ -2549,7 +2549,7 @@ class RearPort(CableTermination, ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_rearport'
+                name='rearport_device_name_key'
             )
         ]
 
@@ -2601,7 +2601,7 @@ class DeviceBay(ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'name'],
-                name='unique_device_and_name_on_devicebay',
+                name='devicebay_device_name_key',
             )
         ]
 
@@ -2698,7 +2698,7 @@ class InventoryItem(ComponentModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'parent', 'name'],
-                name='unique_device_and_parent_and_name_on_inventoryitem'
+                name='inventoryitem_device_parent_name_key'
             )
         ]
 
@@ -2842,11 +2842,11 @@ class Cable(ChangeLoggedModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['termination_a_type', 'termination_a_id'],
-                name='unique_terminations_a_to_b_on_cable'
+                name='cable_terminationatype_terminationaid_key'
             ),
             models.UniqueConstraint(
                 fields=['termination_b_type', 'termination_b_id'],
-                name='unique_terminations_b_to_a_on_cable'
+                name='cable_terminationbtype_terminationbid_key'
             )
         ]
 
diff --git a/netbox/extras/migrations/0019_auto_20190526_1525.py b/netbox/extras/migrations/0019_modernize_unique_constraints.py
similarity index 78%
rename from netbox/extras/migrations/0019_auto_20190526_1525.py
rename to netbox/extras/migrations/0019_modernize_unique_constraints.py
index df290c9d9..ea169dab5 100644
--- a/netbox/extras/migrations/0019_auto_20190526_1525.py
+++ b/netbox/extras/migrations/0019_modernize_unique_constraints.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-26 15:25
+# Generated by Django 2.2.4 on 2019-08-06 15:52
 
 from django.db import migrations, models
 
@@ -28,18 +28,18 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='customfieldchoice',
-            constraint=models.UniqueConstraint(fields=('field', 'value'), name='unique_field_and_value_on_customfieldchoice'),
+            constraint=models.UniqueConstraint(fields=('field', 'value'), name='customfieldchoice_field_value_key'),
         ),
         migrations.AddConstraint(
             model_name='customfieldvalue',
-            constraint=models.UniqueConstraint(fields=('field', 'obj_type', 'obj_id'), name='unique_custom_field_on_customfieldvalue'),
+            constraint=models.UniqueConstraint(fields=('field', 'obj_type', 'obj_id'), name='customfieldvalue_customfield_key'),
         ),
         migrations.AddConstraint(
             model_name='exporttemplate',
-            constraint=models.UniqueConstraint(fields=('content_type', 'name'), name='unique_name_and_type_on_exporttemplate'),
+            constraint=models.UniqueConstraint(fields=('content_type', 'name'), name='exporttemplate_name_contenttype_key'),
         ),
         migrations.AddConstraint(
             model_name='webhook',
-            constraint=models.UniqueConstraint(fields=('payload_url', 'type_create', 'type_update', 'type_delete'), name='unique_webhook_type_and_payload_on_webhook'),
+            constraint=models.UniqueConstraint(fields=('payload_url', 'type_create', 'type_update', 'type_delete'), name='webhook_webhooktype_payload_key'),
         ),
     ]
diff --git a/netbox/extras/models.py b/netbox/extras/models.py
index ddf94f6aa..0548d980a 100644
--- a/netbox/extras/models.py
+++ b/netbox/extras/models.py
@@ -93,7 +93,7 @@ class Webhook(models.Model):
                 fields=[
                     'payload_url', 'type_create', 'type_update', 'type_delete'
                 ],
-                name='unique_webhook_type_and_payload_on_webhook'
+                name='webhook_webhooktype_payload_key'
             )
         ]
 
@@ -269,7 +269,7 @@ class CustomFieldValue(models.Model):
         constraints = [
             models.UniqueConstraint(
                 fields=['field', 'obj_type', 'obj_id'],
-                name='unique_custom_field_on_customfieldvalue'
+                name='customfieldvalue_customfield_key'
             )
         ]
 
@@ -312,7 +312,7 @@ class CustomFieldChoice(models.Model):
         constraints = [
             models.UniqueConstraint(
                 fields=['field', 'value'],
-                name='unique_field_and_value_on_customfieldchoice'
+                name='customfieldchoice_field_value_key'
             )
         ]
 
@@ -467,7 +467,7 @@ class ExportTemplate(models.Model):
         constraints = [
             models.UniqueConstraint(
                 fields=['content_type', 'name'],
-                name='unique_name_and_type_on_exporttemplate'
+                name='exporttemplate_name_contenttype_key'
             )
         ]
 
diff --git a/netbox/ipam/migrations/0025_auto_20190526_1525.py b/netbox/ipam/migrations/0025_modernize_unique_constraints.py
similarity index 80%
rename from netbox/ipam/migrations/0025_auto_20190526_1525.py
rename to netbox/ipam/migrations/0025_modernize_unique_constraints.py
index 654025a0f..5d607beaa 100644
--- a/netbox/ipam/migrations/0025_auto_20190526_1525.py
+++ b/netbox/ipam/migrations/0025_modernize_unique_constraints.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-26 15:25
+# Generated by Django 2.2.4 on 2019-08-06 15:52
 
 from django.db import migrations, models
 
@@ -20,18 +20,18 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='vlan',
-            constraint=models.UniqueConstraint(fields=('group', 'vid'), name='unique_group_and_vid_on_vlan'),
+            constraint=models.UniqueConstraint(fields=('group', 'vid'), name='vlan_group_vid_key'),
         ),
         migrations.AddConstraint(
             model_name='vlan',
-            constraint=models.UniqueConstraint(fields=('group', 'name'), name='unique_group_and_name_on_vlan'),
+            constraint=models.UniqueConstraint(fields=('group', 'name'), name='vlan_group_name_key'),
         ),
         migrations.AddConstraint(
             model_name='vlangroup',
-            constraint=models.UniqueConstraint(fields=('site', 'name'), name='unique_site_and_name_on_vlangroup'),
+            constraint=models.UniqueConstraint(fields=('site', 'name'), name='vlangroup_site_name_key'),
         ),
         migrations.AddConstraint(
             model_name='vlangroup',
-            constraint=models.UniqueConstraint(fields=('site', 'slug'), name='unique_site_and_slug_on_vlangroup'),
+            constraint=models.UniqueConstraint(fields=('site', 'slug'), name='vlangroup_site_slug_key'),
         ),
     ]
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 37d5d1287..10d8a47f0 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -743,11 +743,11 @@ class VLANGroup(ChangeLoggedModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['site', 'name'],
-                name='unique_site_and_name_on_vlangroup'
+                name='vlangroup_site_name_key'
             ),
             models.UniqueConstraint(
                 fields=['site', 'slug'],
-                name='unique_site_and_slug_on_vlangroup'
+                name='vlangroup_site_slug_key'
             )
         ]
         verbose_name = 'VLAN group'
@@ -845,11 +845,11 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['group', 'vid'],
-                name='unique_group_and_vid_on_vlan'
+                name='vlan_group_vid_key'
             ),
             models.UniqueConstraint(
                 fields=['group', 'name'],
-                name='unique_group_and_name_on_vlan'
+                name='vlan_group_name_key'
             )
         ]
         verbose_name = 'VLAN'
diff --git a/netbox/secrets/migrations/0006_auto_20190526_1525.py b/netbox/secrets/migrations/0006_modernize_unique_constraints.py
similarity index 80%
rename from netbox/secrets/migrations/0006_auto_20190526_1525.py
rename to netbox/secrets/migrations/0006_modernize_unique_constraints.py
index ebbcac2a6..d8519ae0c 100644
--- a/netbox/secrets/migrations/0006_auto_20190526_1525.py
+++ b/netbox/secrets/migrations/0006_modernize_unique_constraints.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-26 15:25
+# Generated by Django 2.2.4 on 2019-08-06 15:52
 
 from django.db import migrations, models
 
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='secret',
-            constraint=models.UniqueConstraint(fields=('device', 'role', 'name'), name='unique_device_and_role_and_name'),
+            constraint=models.UniqueConstraint(fields=('device', 'role', 'name'), name='secret_device_role_name_key'),
         ),
     ]
diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index 3b1c4d1c3..73e50efee 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -355,7 +355,7 @@ class Secret(ChangeLoggedModel, CustomFieldModel):
         constraints = [
             models.UniqueConstraint(
                 fields=['device', 'role', 'name'],
-                name='unique_device_and_role_and_name'
+                name='secret_device_role_name_key'
             )
         ]