diff --git a/lib/fog/vcloud_director/requests/compute/post_capture_vapp.rb b/lib/fog/vcloud_director/requests/compute/post_capture_vapp.rb
index 04dda5285..5257f8906 100644
--- a/lib/fog/vcloud_director/requests/compute/post_capture_vapp.rb
+++ b/lib/fog/vcloud_director/requests/compute/post_capture_vapp.rb
@@ -27,7 +27,7 @@ module Fog
               if options.key?(:Description)
                 Description options[:Description]
               end
-              Source(:href => "#{endpoint}vApp/#{source_id}")
+              Source(:href => "#{end_point}vApp/#{source_id}")
             }
           end.to_xml
 
diff --git a/lib/fog/vcloud_director/requests/compute/post_clone_media.rb b/lib/fog/vcloud_director/requests/compute/post_clone_media.rb
index 921e27b88..9701a887d 100644
--- a/lib/fog/vcloud_director/requests/compute/post_clone_media.rb
+++ b/lib/fog/vcloud_director/requests/compute/post_clone_media.rb
@@ -29,7 +29,7 @@ module Fog
               if options.key?(:Description)
                 Description options[:Description]
               end
-              Source(:href => "#{endpoint}media/#{source_id}")
+              Source(:href => "#{end_point}media/#{source_id}")
               if options.key?(:IsSourceDelete)
                 IsSourceDelete options[:IsSourceDelete]
               end
diff --git a/lib/fog/vcloud_director/requests/compute/post_clone_vapp.rb b/lib/fog/vcloud_director/requests/compute/post_clone_vapp.rb
index 8f7f2c34f..e9d99737a 100644
--- a/lib/fog/vcloud_director/requests/compute/post_clone_vapp.rb
+++ b/lib/fog/vcloud_director/requests/compute/post_clone_vapp.rb
@@ -40,7 +40,7 @@ module Fog
               InstantiationParams {
                 # TODO
               }
-              Source(:href => "#{endpoint}vApp/#{source_id}")
+              Source(:href => "#{end_point}vApp/#{source_id}")
               if options.key?(:IsSourceDelete)
                 IsSourceDelete options[:IsSourceDelete]
               end
diff --git a/lib/fog/vcloud_director/requests/compute/post_clone_vapp_template.rb b/lib/fog/vcloud_director/requests/compute/post_clone_vapp_template.rb
index 6445603f6..046e7bf2e 100644
--- a/lib/fog/vcloud_director/requests/compute/post_clone_vapp_template.rb
+++ b/lib/fog/vcloud_director/requests/compute/post_clone_vapp_template.rb
@@ -30,7 +30,7 @@ module Fog
               if options.key?(:Description)
                 Description options[:Description]
               end
-              Source(:href => "#{endpoint}vAppTemplate/#{source_id}")
+              Source(:href => "#{end_point}vAppTemplate/#{source_id}")
               if options.key?(:IsSourceDelete)
                 IsSourceDelete options[:IsSourceDelete]
               end
diff --git a/lib/fog/vcloud_director/requests/compute/put_cpu.rb b/lib/fog/vcloud_director/requests/compute/put_cpu.rb
index 43e92a7c5..aefea2832 100644
--- a/lib/fog/vcloud_director/requests/compute/put_cpu.rb
+++ b/lib/fog/vcloud_director/requests/compute/put_cpu.rb
@@ -19,7 +19,7 @@ module Fog
         # @since vCloud API version 0.9
         def put_cpu(id, num_cpus)
           data = <<EOF
-          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="#{endpoint}vApp/#{id}/virtualHardwareSection/cpu" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
+          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="#{end_point}vApp/#{id}/virtualHardwareSection/cpu" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
             <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
             <rasd:Description>Number of Virtual CPUs</rasd:Description>
             <rasd:ElementName>#{num_cpus} virtual CPU(s)</rasd:ElementName>
@@ -28,7 +28,7 @@ module Fog
             <rasd:ResourceType>3</rasd:ResourceType>
             <rasd:VirtualQuantity>#{num_cpus}</rasd:VirtualQuantity>
             <rasd:Weight>0</rasd:Weight>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{endpoint}vApp/#{id}/virtualHardwareSection/cpu"/>
+            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{end_point}vApp/#{id}/virtualHardwareSection/cpu"/>
           </Item>
 EOF
 
diff --git a/lib/fog/vcloud_director/requests/compute/put_memory.rb b/lib/fog/vcloud_director/requests/compute/put_memory.rb
index 84b31767b..ef1929220 100644
--- a/lib/fog/vcloud_director/requests/compute/put_memory.rb
+++ b/lib/fog/vcloud_director/requests/compute/put_memory.rb
@@ -19,7 +19,7 @@ module Fog
         # @since vCloud API version 0.9
         def put_memory(id, memory)
           data = <<EOF
-          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="#{endpoint}vApp/#{id}/virtualHardwareSection/memory" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
+          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="#{end_point}vApp/#{id}/virtualHardwareSection/memory" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
             <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
             <rasd:Description>Memory Size</rasd:Description>
             <rasd:ElementName>#{memory} MB of memory</rasd:ElementName>
@@ -28,7 +28,7 @@ module Fog
             <rasd:ResourceType>4</rasd:ResourceType>
             <rasd:VirtualQuantity>#{memory}</rasd:VirtualQuantity>
             <rasd:Weight>0</rasd:Weight>
-            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{endpoint}vApp/#{id}/virtualHardwareSection/memory"/>
+            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{end_point}vApp/#{id}/virtualHardwareSection/memory"/>
           </Item>
 EOF