diff --git a/lib/fog/openstack/models/orchestration/events.rb b/lib/fog/openstack/models/orchestration/events.rb
index e8405f05c..e6eb3d10e 100644
--- a/lib/fog/openstack/models/orchestration/events.rb
+++ b/lib/fog/openstack/models/orchestration/events.rb
@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/event'
 
 module Fog
diff --git a/lib/fog/openstack/models/orchestration/resources.rb b/lib/fog/openstack/models/orchestration/resources.rb
index 19cd9ecf1..94499150d 100644
--- a/lib/fog/openstack/models/orchestration/resources.rb
+++ b/lib/fog/openstack/models/orchestration/resources.rb
@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/resource'
 
 module Fog
diff --git a/lib/fog/openstack/models/orchestration/stacks.rb b/lib/fog/openstack/models/orchestration/stacks.rb
index f905032b8..51bcfd284 100644
--- a/lib/fog/openstack/models/orchestration/stacks.rb
+++ b/lib/fog/openstack/models/orchestration/stacks.rb
@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/stack'
 
 module Fog
diff --git a/lib/fog/openstack/models/orchestration/templates.rb b/lib/fog/openstack/models/orchestration/templates.rb
index 25dda4260..d76e88b43 100644
--- a/lib/fog/openstack/models/orchestration/templates.rb
+++ b/lib/fog/openstack/models/orchestration/templates.rb
@@ -1,3 +1,4 @@
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/orchestration/template'
 
 module Fog
diff --git a/lib/fog/openstack/orchestration.rb b/lib/fog/openstack/orchestration.rb
index 3acc93ad0..8142d76ea 100644
--- a/lib/fog/openstack/orchestration.rb
+++ b/lib/fog/openstack/orchestration.rb
@@ -155,7 +155,7 @@ module Fog
                 'X-Auth-User'  => @openstack_username,
                 'X-Auth-Key'   => @openstack_api_key
               }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{@tenant_id}/#{params[:path]}",
+              :path     => "#{@path}/#{params[:path]}",
               :query    => params[:query]
             }))
           rescue Excon::Errors::Unauthorized => error