diff --git a/netbox/ipam/migrations/0017_ipaddress_roles.py b/netbox/ipam/migrations/0017_ipaddress_roles.py
index 6ad44c146..d91c3daa9 100644
--- a/netbox/ipam/migrations/0017_ipaddress_roles.py
+++ b/netbox/ipam/migrations/0017_ipaddress_roles.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-06-14 19:52
+# Generated by Django 1.11.1 on 2017-06-16 19:37
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='ipaddress',
             name='role',
-            field=models.PositiveSmallIntegerField(blank=True, choices=[(10, 'Loopback'), (20, 'Secondary'), (30, 'Anycast'), (40, 'Virtual'), (41, 'VRRP'), (42, 'HSRP'), (43, 'GLBP')], help_text='The functional role of this IP', null=True, verbose_name='Role'),
+            field=models.PositiveSmallIntegerField(blank=True, choices=[(10, 'Loopback'), (20, 'Secondary'), (30, 'Anycast'), (40, 'VIP'), (41, 'VRRP'), (42, 'HSRP'), (43, 'GLBP')], help_text='The functional role of this IP', null=True, verbose_name='Role'),
         ),
         migrations.AlterField(
             model_name='ipaddress',
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index bc1e8fe76..dd1de8622 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -50,7 +50,7 @@ IPADDRESS_STATUS_CHOICES = (
 IPADDRESS_ROLE_LOOPBACK = 10
 IPADDRESS_ROLE_SECONDARY = 20
 IPADDRESS_ROLE_ANYCAST = 30
-IPADDRESS_ROLE_VIRTUAL = 40
+IPADDRESS_ROLE_VIP = 40
 IPADDRESS_ROLE_VRRP = 41
 IPADDRESS_ROLE_HSRP = 42
 IPADDRESS_ROLE_GLBP = 43
@@ -58,7 +58,7 @@ IPADDRESS_ROLE_CHOICES = (
     (IPADDRESS_ROLE_LOOPBACK, 'Loopback'),
     (IPADDRESS_ROLE_SECONDARY, 'Secondary'),
     (IPADDRESS_ROLE_ANYCAST, 'Anycast'),
-    (IPADDRESS_ROLE_VIRTUAL, 'Virtual'),
+    (IPADDRESS_ROLE_VIP, 'VIP'),
     (IPADDRESS_ROLE_VRRP, 'VRRP'),
     (IPADDRESS_ROLE_HSRP, 'HSRP'),
     (IPADDRESS_ROLE_GLBP, 'GLBP'),