diff --git a/attributes/default.rb b/attributes/default.rb
index d6e12375..76524a8a 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -175,7 +175,7 @@ default['openstack']['network_lbaas']['conf'].tap do |conf|
   conf['DEFAULT']['periodic_interval'] = 10
   conf['DEFAULT']['ovs_use_veth'] = false
   conf['DEFAULT']['interface_driver'] = 'neutron.agent.linux.interface.OVSInterfaceDriver'
-  conf['DEFAULT']['device_driver'] = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'
+  conf['DEFAULT']['device_driver'] = 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver'
   case platform_family
   when 'fedora', 'rhel'
     conf['haproxy']['user_group'] = 'nobody'
@@ -211,7 +211,7 @@ default['openstack']['network']['platform'].tap do |platform|
   platform['vpn_device_driver_services'] =
     %w(strongswan)
   platform['neutron_lb_agent_service'] =
-    'neutron-lbaas-agent'
+    'neutron-lbaasv2-agent'
   platform['neutron_metadata_agent_service'] =
     'neutron-metadata-agent'
   platform['neutron_metering_agent_service'] =
@@ -272,7 +272,7 @@ default['openstack']['network']['platform'].tap do |platform|
     platform['neutron_vpnaas_packages'] =
       %w(python-neutron-vpnaas neutron-vpn-agent)
     platform['neutron_lbaas_packages'] =
-      %w(python-neutron-lbaas neutron-lbaas-agent haproxy)
+      %w(python-neutron-lbaas neutron-lbaas-common neutron-lbaasv2-agent haproxy)
     platform['neutron_openvswitch_packages'] =
       %w(openvswitch-switch bridge-utils)
     platform['neutron_openvswitch_build_packages'] =
diff --git a/spec/lbaas_spec.rb b/spec/lbaas_spec.rb
index fcfaff70..dc363392 100644
--- a/spec/lbaas_spec.rb
+++ b/spec/lbaas_spec.rb
@@ -12,7 +12,7 @@ describe 'openstack-network::lbaas' do
     include_context 'neutron-stubs'
 
     it do
-      %w(python-neutron-lbaas neutron-lbaas-agent haproxy)
+      %w(python-neutron-lbaas neutron-lbaasv2-agent haproxy)
         .each do |pkg|
         expect(chef_run).to upgrade_package(pkg)
       end
@@ -33,7 +33,7 @@ describe 'openstack-network::lbaas' do
           /^periodic_interval = 10$/,
           /^ovs_use_veth = false$/,
           /^interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver$/,
-          /^device_driver = neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver$/
+          /^device_driver = neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver$/
         ].each do |line|
           expect(chef_run).to render_file(file.name).with_content(line)
         end