diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp
index f9cc997ed..031b7f4e7 100644
--- a/manifests/network/neutron.pp
+++ b/manifests/network/neutron.pp
@@ -121,7 +121,7 @@ class nova::network::neutron (
     'DEFAULT/vif_plugging_timeout':    value => $vif_plugging_timeout;
     'neutron/auth_strategy':           value => $neutron_auth_strategy;
     'neutron/url':                     value => $neutron_url;
-    'neutron/url_timeout':             value => $neutron_url_timeout;
+    'neutron/timeout':                 value => $neutron_url_timeout;
     'neutron/admin_tenant_name':       value => $neutron_admin_tenant_name;
     'neutron/default_tenant_id':       value => $neutron_default_tenant_id;
     'neutron/region_name':             value => $neutron_region_name;
diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb
index 8d44c204c..303288dc2 100644
--- a/spec/classes/nova_network_neutron_spec.rb
+++ b/spec/classes/nova_network_neutron_spec.rb
@@ -33,7 +33,7 @@ describe 'nova::network::neutron' do
       is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value(default_params[:dhcp_domain])
       is_expected.to contain_nova_config('neutron/auth_strategy').with_value(default_params[:neutron_auth_strategy])
       is_expected.to contain_nova_config('neutron/url').with_value(default_params[:neutron_url])
-      is_expected.to contain_nova_config('neutron/url_timeout').with_value(default_params[:neutron_url_timeout])
+      is_expected.to contain_nova_config('neutron/timeout').with_value(default_params[:neutron_url_timeout])
       is_expected.to contain_nova_config('neutron/admin_tenant_name').with_value(default_params[:neutron_admin_tenant_name])
       is_expected.to contain_nova_config('neutron/default_tenant_id').with_value(default_params[:neutron_default_tenant_id])
       is_expected.to contain_nova_config('neutron/region_name').with_value(default_params[:neutron_region_name])
@@ -79,7 +79,7 @@ describe 'nova::network::neutron' do
       is_expected.to contain_nova_config('DEFAULT/network_api_class').with_value('network.api.class')
       is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value(params[:dhcp_domain])
       is_expected.to contain_nova_config('neutron/url').with_value(params[:neutron_url])
-      is_expected.to contain_nova_config('neutron/url_timeout').with_value(params[:neutron_url_timeout])
+      is_expected.to contain_nova_config('neutron/timeout').with_value(params[:neutron_url_timeout])
       is_expected.to contain_nova_config('neutron/admin_tenant_name').with_value(params[:neutron_admin_tenant_name])
       is_expected.to contain_nova_config('neutron/default_tenant_id').with_value(params[:neutron_default_tenant_id])
       is_expected.to contain_nova_config('neutron/region_name').with_value(params[:neutron_region_name])