diff --git a/manifests/plugins/midonet.pp b/manifests/plugins/midonet.pp
index c44499f98..7255d8afc 100644
--- a/manifests/plugins/midonet.pp
+++ b/manifests/plugins/midonet.pp
@@ -98,7 +98,7 @@ class neutron::plugins::midonet (
   $midonet_cluster_port  = '8181',
   $keystone_username     = 'neutron',
   $keystone_password     = $::os_service_default,
-  $keystone_tenant       = 'service',
+  $keystone_tenant       = 'services',
   $sync_db               = false,
   $purge_config          = false,
   $package_ensure        = 'present',
diff --git a/manifests/plugins/ml2/bigswitch/restproxy.pp b/manifests/plugins/ml2/bigswitch/restproxy.pp
index 119941838..43f88a1e0 100644
--- a/manifests/plugins/ml2/bigswitch/restproxy.pp
+++ b/manifests/plugins/ml2/bigswitch/restproxy.pp
@@ -83,7 +83,7 @@
 class neutron::plugins::ml2::bigswitch::restproxy (
   $servers                = $::os_service_default,
   $server_auth            = $::os_service_default,
-  $auth_tenant            = 'service',
+  $auth_tenant            = 'services',
   $auth_password          = false,
   $auth_user              = 'neutron',
   $auth_url               = false,
diff --git a/manifests/plugins/ml2/midonet.pp b/manifests/plugins/ml2/midonet.pp
index 117487505..dad8582ee 100644
--- a/manifests/plugins/ml2/midonet.pp
+++ b/manifests/plugins/ml2/midonet.pp
@@ -16,7 +16,7 @@
 #
 # [*project_id*]
 #   (optional) Name of the project that MidoNet admin user belongs to.
-#   Defaults to 'service'
+#   Defaults to 'services'
 #
 class neutron::plugins::ml2::midonet (
   $midonet_uri,
diff --git a/releasenotes/notes/consistent-project-name-6e29ffc13a767486.yaml b/releasenotes/notes/consistent-project-name-6e29ffc13a767486.yaml
new file mode 100644
index 000000000..e1be7ee85
--- /dev/null
+++ b/releasenotes/notes/consistent-project-name-6e29ffc13a767486.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The default value for neutron::plugins::midonet::keystone_tenant and
+    neutron::plugins::ml2::bigswitch::restproxy::auth_tenant has been
+    changed from 'service' to 'services'.
diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
index a26a2b80e..bfef550fc 100644
--- a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
@@ -30,7 +30,7 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
     it do
       should contain_neutron_plugin_ml2('restproxy/servers').with_value(params[:servers])
       should contain_neutron_plugin_ml2('restproxy/server_auth').with_value(params[:server_auth])
-      should contain_neutron_plugin_ml2('restproxy/auth_tenant').with_value('service')
+      should contain_neutron_plugin_ml2('restproxy/auth_tenant').with_value('services')
       should contain_neutron_plugin_ml2('restproxy/auth_password').with_value(false)
       should contain_neutron_plugin_ml2('restproxy/auth_user').with_value('neutron')
       should contain_neutron_plugin_ml2('restproxy/auth_url').with_value(false)
@@ -69,7 +69,7 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
 
         should contain_neutron_plugin_ml2('restproxy/servers').with_value(params[:servers])
         should contain_neutron_plugin_ml2('restproxy/server_auth').with_value(params[:server_auth])
-        should contain_neutron_plugin_ml2('restproxy/auth_tenant').with_value('service')
+        should contain_neutron_plugin_ml2('restproxy/auth_tenant').with_value('services')
         should contain_neutron_plugin_ml2('restproxy/auth_password').with_value(false)
         should contain_neutron_plugin_ml2('restproxy/auth_user').with_value('neutron')
         should contain_neutron_plugin_ml2('restproxy/auth_url').with_value(false)