diff --git a/quark/db/__init__.py b/quark/db/__init__.py
index 2093640..e473ace 100644
--- a/quark/db/__init__.py
+++ b/quark/db/__init__.py
@@ -1,3 +1,3 @@
-SHARED_IP = 'shared'
-FIXED_IP = 'fixed'
-FLOATING_IP = 'floating'
+SHARED = 'shared'
+FIXED = 'fixed'
+FLOATING = 'floating'
diff --git a/quark/db/models.py b/quark/db/models.py
index 6d11576..54a6233 100644
--- a/quark/db/models.py
+++ b/quark/db/models.py
@@ -25,9 +25,9 @@ from sqlalchemy.ext import hybrid
 from sqlalchemy import orm
 
 from quark.db import custom_types
-from quark.db import FIXED_IP
-from quark.db import FLOATING_IP
-from quark.db import SHARED_IP
+from quark.db import FIXED
+from quark.db import FLOATING
+from quark.db import SHARED
 # NOTE(mdietz): This is the only way to actually create the quotas table,
 #              regardless if we need it. This is how it's done upstream.
 # NOTE(jhammond): If it isn't obvious quota_driver is unused and that's ok.
@@ -159,7 +159,7 @@ class IPAddress(BASEV2, models.HasId):
     # Legacy data
     used_by_tenant_id = sa.Column(sa.String(255))
 
-    address_type = sa.Column(sa.Enum(FIXED_IP, FLOATING_IP, SHARED_IP,
+    address_type = sa.Column(sa.Enum(FIXED, FLOATING, SHARED,
                              name="quark_ip_address_types"))
     associations = orm.relationship(PortIpAssociation, backref="ip_address")
 
diff --git a/quark/ipam.py b/quark/ipam.py
index f65ab83..ec411ad 100644
--- a/quark/ipam.py
+++ b/quark/ipam.py
@@ -30,7 +30,7 @@ from oslo.config import cfg
 from oslo.db import exception as db_exception
 
 from quark.db import api as db_api
-from quark.db import FIXED_IP
+from quark.db import FIXED
 from quark.db import models
 from quark import exceptions as q_exc
 from quark import utils
@@ -300,7 +300,7 @@ class QuarkIpam(object):
                                     allocated_at=timeutils.utcnow(),
                                     port_id=port_id,
                                     address_type=kwargs.get('address_type',
-                                                            FIXED_IP))
+                                                            FIXED))
                                 return [updated_address]
                             else:
                                 # Make sure we never find it again
@@ -350,7 +350,7 @@ class QuarkIpam(object):
                     deallocated=0, version=subnet["ip_version"],
                     network_id=net_id,
                     port_id=port_id,
-                    address_type=kwargs.get('address_type', FIXED_IP))
+                    address_type=kwargs.get('address_type', FIXED))
                 address["deallocated"] = 0
         except Exception:
             # NOTE(mdietz): Our version of sqlalchemy incorrectly raises None
@@ -433,7 +433,7 @@ class QuarkIpam(object):
                             deallocated_at=None,
                             used_by_tenant_id=context.tenant_id,
                             allocated_at=timeutils.utcnow(),
-                            address_type=kwargs.get('address_type', FIXED_IP))
+                            address_type=kwargs.get('address_type', FIXED))
 
                 # This triggers when the IP is allocated to another tenant,
                 # either because we missed it due to our filters above, or
@@ -444,7 +444,7 @@ class QuarkIpam(object):
                             context, address=ip_address,
                             subnet_id=subnet["id"],
                             version=subnet["ip_version"], network_id=net_id,
-                            address_type=kwargs.get('address_type', FIXED_IP))
+                            address_type=kwargs.get('address_type', FIXED))
                 except db_exception.DBDuplicateEntry:
                     LOG.info("{0} exists but was already "
                              "allocated".format(str(ip_address)))
diff --git a/quark/plugin_modules/ip_addresses.py b/quark/plugin_modules/ip_addresses.py
index 8db1a95..d499436 100644
--- a/quark/plugin_modules/ip_addresses.py
+++ b/quark/plugin_modules/ip_addresses.py
@@ -19,8 +19,8 @@ from oslo.config import cfg
 import webob
 
 from quark.db import api as db_api
-from quark.db import FIXED_IP
-from quark.db import SHARED_IP
+from quark.db import FIXED
+from quark.db import SHARED
 from quark import exceptions as quark_exceptions
 from quark import ipam
 from quark import plugin_views as v
@@ -78,7 +78,7 @@ def _can_be_shared(address_model):
 
 def create_ip_address(context, body):
     LOG.info("create_ip_address for tenant %s" % context.tenant_id)
-    address_type = SHARED_IP if _shared_ip_request(body) else FIXED_IP
+    address_type = SHARED if _shared_ip_request(body) else FIXED
     ip_dict = body.get("ip_address")
     port_ids = ip_dict.get('port_ids', [])
     network_id = ip_dict.get('network_id')