diff --git a/quark/agent/agent.py b/quark/agent/agent.py
index 6b6fa11..e8b6641 100644
--- a/quark/agent/agent.py
+++ b/quark/agent/agent.py
@@ -17,6 +17,7 @@ import random
 import sys
 import time
 
+from neutron._i18n import _
 from neutron.common import config
 from neutron.common import utils as n_utils
 from oslo_config import cfg
diff --git a/quark/allocation_pool.py b/quark/allocation_pool.py
index fca11cd..87449ad 100644
--- a/quark/allocation_pool.py
+++ b/quark/allocation_pool.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import netaddr
+from neutron._i18n import _
 from neutron.common import exceptions as n_exc_ext
 from oslo_log import log as logging
 
diff --git a/quark/billing.py b/quark/billing.py
index 7811d18..d517b2c 100644
--- a/quark/billing.py
+++ b/quark/billing.py
@@ -43,6 +43,7 @@ NOTE: assumes that the beginning of a billing cycle is midnight.
 """
 
 import datetime
+from neutron._i18n import _
 from neutron.common import rpc as n_rpc
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/quark/cache/redis_base.py b/quark/cache/redis_base.py
index 458e06b..556d760 100644
--- a/quark/cache/redis_base.py
+++ b/quark/cache/redis_base.py
@@ -18,6 +18,7 @@ import json
 import string
 
 import netaddr
+from neutron._i18n import _
 from oslo_config import cfg
 from oslo_log import log as logging
 
diff --git a/quark/drivers/floating_ip_registry.py b/quark/drivers/floating_ip_registry.py
index ec8f8c6..9189ba0 100644
--- a/quark/drivers/floating_ip_registry.py
+++ b/quark/drivers/floating_ip_registry.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from oslo_config import cfg
 
 from quark.drivers.registry import DriverRegistryBase
diff --git a/quark/drivers/nvp_driver.py b/quark/drivers/nvp_driver.py
index 50a56d5..a84d19f 100644
--- a/quark/drivers/nvp_driver.py
+++ b/quark/drivers/nvp_driver.py
@@ -21,6 +21,7 @@ import contextlib
 import random
 
 import aiclib
+from neutron._i18n import _
 from neutron.extensions import securitygroup as sg_ext
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/quark/drivers/unicorn_driver.py b/quark/drivers/unicorn_driver.py
index c8270a8..c99446a 100644
--- a/quark/drivers/unicorn_driver.py
+++ b/quark/drivers/unicorn_driver.py
@@ -20,6 +20,8 @@ Unicorn driver for Quark
 import json
 import requests
 
+from neutron._i18n import _
+
 from oslo_config import cfg
 from oslo_log import log as logging
 
diff --git a/quark/exceptions.py b/quark/exceptions.py
index cce8db0..21bf0f6 100644
--- a/quark/exceptions.py
+++ b/quark/exceptions.py
@@ -12,6 +12,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+from neutron._i18n import _
 from neutron_lib import exceptions as n_exc
 
 
diff --git a/quark/ipam.py b/quark/ipam.py
index 5422f67..6629b09 100644
--- a/quark/ipam.py
+++ b/quark/ipam.py
@@ -24,6 +24,7 @@ import time
 import uuid
 
 import netaddr
+from neutron._i18n import _
 from neutron.common import exceptions as n_exc_ext
 from neutron_lib import exceptions as n_exc
 from oslo_concurrency import lockutils
diff --git a/quark/network_strategy.py b/quark/network_strategy.py
index 7b2c577..896d117 100644
--- a/quark/network_strategy.py
+++ b/quark/network_strategy.py
@@ -15,6 +15,7 @@
 
 import json
 
+from neutron._i18n import _
 from oslo_config import cfg
 from oslo_log import log as logging
 
diff --git a/quark/plugin.py b/quark/plugin.py
index 4da23b3..824cfeb 100644
--- a/quark/plugin.py
+++ b/quark/plugin.py
@@ -17,6 +17,7 @@
 v2 Neutron Plug-in API Quark Implementation
 """
 
+from neutron._i18n import _
 from neutron.extensions import securitygroup as sg_ext
 from neutron import neutron_plugin_base_v2
 from neutron.quota import resource as qres
diff --git a/quark/plugin_modules/floating_ips.py b/quark/plugin_modules/floating_ips.py
index 0ccfb48..c999275 100644
--- a/quark/plugin_modules/floating_ips.py
+++ b/quark/plugin_modules/floating_ips.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/quark/plugin_modules/ip_addresses.py b/quark/plugin_modules/ip_addresses.py
index 46dbaab..cd6ff67 100644
--- a/quark/plugin_modules/ip_addresses.py
+++ b/quark/plugin_modules/ip_addresses.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/quark/plugin_modules/router.py b/quark/plugin_modules/router.py
index 18ac2a8..2ddc451 100644
--- a/quark/plugin_modules/router.py
+++ b/quark/plugin_modules/router.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from oslo_config import cfg
 from oslo_log import log as logging
 
diff --git a/quark/plugin_modules/subnets.py b/quark/plugin_modules/subnets.py
index bd02d3f..294a4d0 100644
--- a/quark/plugin_modules/subnets.py
+++ b/quark/plugin_modules/subnets.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import netaddr
+from neutron._i18n import _
 from neutron.common import config as neutron_cfg
 from neutron import quota
 from neutron_lib import exceptions as n_exc
diff --git a/quark/plugin_views.py b/quark/plugin_views.py
index bc812c8..6e696a8 100644
--- a/quark/plugin_views.py
+++ b/quark/plugin_views.py
@@ -18,6 +18,7 @@ View Helpers for Quark Plugin
 """
 
 import netaddr
+from neutron._i18n import _
 from oslo_config import cfg
 from oslo_log import log as logging
 
diff --git a/quark/tests/functional/plugin_modules/test_subnets.py b/quark/tests/functional/plugin_modules/test_subnets.py
index 705722e..e1725ee 100644
--- a/quark/tests/functional/plugin_modules/test_subnets.py
+++ b/quark/tests/functional/plugin_modules/test_subnets.py
@@ -15,7 +15,7 @@
 
 import mock
 import netaddr
-from neutron.api.v2 import attributes as neutron_attrs
+from neutron_lib import constants as neutron_attrs
 from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 
diff --git a/quark/tests/plugin_modules/test_ports.py b/quark/tests/plugin_modules/test_ports.py
index ef528e4..1125b9c 100644
--- a/quark/tests/plugin_modules/test_ports.py
+++ b/quark/tests/plugin_modules/test_ports.py
@@ -18,7 +18,7 @@ import json
 
 import mock
 import netaddr
-from neutron.api.v2 import attributes as neutron_attrs
+from neutron_lib import constants as neutron_attrs
 from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 
diff --git a/quark/tests/plugin_modules/test_subnets.py b/quark/tests/plugin_modules/test_subnets.py
index 64b9c73..a4d4417 100644
--- a/quark/tests/plugin_modules/test_subnets.py
+++ b/quark/tests/plugin_modules/test_subnets.py
@@ -20,8 +20,8 @@ import json
 import uuid
 
 import mock
-from neutron.api.v2 import attributes as neutron_attrs
 from neutron.common import exceptions as n_exc_ext
+from neutron_lib import constants as neutron_attrs
 from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 
diff --git a/quark/utils.py b/quark/utils.py
index a72db4f..c1e05d7 100644
--- a/quark/utils.py
+++ b/quark/utils.py
@@ -25,7 +25,7 @@ except Exception:
     # Don't want to force pstats into the venv if it's not always used
     pass
 
-from neutron.api.v2 import attributes
+from neutron_lib import constants as attributes
 from neutron_lib import exceptions as n_exc
 from oslo_log import log as logging
 import webob