diff --git a/README.md b/README.md
index 5fb282b..0acb3fe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# govcloudair [![Build Status](https://ci.vmware.run/api/badges/ukcloud/govcloudair/status.svg)](https://ci.vmware.run/ukcloud/govcloudair) [![Build Status](https://travis-ci.org/ukcloud/govcloudair.svg?branch=master)](https://travis-ci.org/ukcloud/govcloudair) [![Coverage Status](https://coveralls.io/repos/ukcloud/govcloudair/badge.svg?branch=master&service=github)](https://coveralls.io/github/ukcloud/govcloudair?branch=master) [![GoDoc](https://godoc.org/github.com/ukcloud/govcloudair?status.svg)](http://godoc.org/github.com/ukcloud/govcloudair) [![Join the chat at https://gitter.im/ukcloud/govcloudair](https://badges.gitter.im/ukcloud/govcloudair.svg)](https://gitter.im/ukcloud/govcloudair?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# govcloudair [![Build Status](https://ci.vmware.run/api/badges/ukcloud/govcloudair/status.svg)](https://ci.vmware.run/ukcloud/govcloudair) [![Build Status](https://travis-ci.org/UKCloud/govcloudair.svg?branch=master)](https://travis-ci.org/UKCloud/govcloudair) [![Coverage Status](https://coveralls.io/repos/ukcloud/govcloudair/badge.svg?branch=master&service=github)](https://coveralls.io/github/ukcloud/govcloudair?branch=master) [![GoDoc](https://godoc.org/github.com/UKCloud/govcloudair?status.svg)](http://godoc.org/github.com/UKCloud/govcloudair) [![Join the chat at https://gitter.im/ukcloud/govcloudair](https://badges.gitter.im/ukcloud/govcloudair.svg)](https://gitter.im/ukcloud/govcloudair?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 This repo provides the `govcloudair` package which offers an interface to the vCloud Air 5.6 and 5.7 API and vCloud Director 5.5 API.
 
 It serves as a foundation for a project currently in development, there are plans to make it a general purpose API in the future. The `govcloudair` package is used by the Terraform provider for vCloud Director.
@@ -17,7 +17,7 @@ import (
         "net/url"
         "os"
 
-        govcd "github.com/ukcloud/govcloudair"
+        govcd "github.com/UKCloud/govcloudair"
 )
 
 type Config struct {
@@ -62,4 +62,3 @@ func main() {
   fmt.Printf("Org URL: %s\n", client.OrgHREF.String())
 }
 ```
-
diff --git a/api.go b/api.go
index b97b335..99d22ab 100644
--- a/api.go
+++ b/api.go
@@ -13,7 +13,7 @@ import (
 	"net/http"
 	"net/url"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 // Client provides a client to vCloud Air, values can be populated automatically using the Authenticate method.
diff --git a/api_vca.go b/api_vca.go
index 4d5a925..884d7f3 100644
--- a/api_vca.go
+++ b/api_vca.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 // Client provides a client to vCloud Air, values can be populated automatically using the Authenticate method.
diff --git a/api_vca_test.go b/api_vca_test.go
index fba4a65..42162db 100644
--- a/api_vca_test.go
+++ b/api_vca_test.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ukcloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/testutil"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/api_vcd_test.go b/api_vcd_test.go
index ba90848..df9cc73 100644
--- a/api_vcd_test.go
+++ b/api_vcd_test.go
@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/ukcloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/testutil"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/catalog.go b/catalog.go
index 2cf1050..2e08875 100644
--- a/catalog.go
+++ b/catalog.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/url"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type Catalog struct {
diff --git a/catalogitem.go b/catalogitem.go
index e4baae4..2550781 100644
--- a/catalogitem.go
+++ b/catalogitem.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/url"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type CatalogItem struct {
diff --git a/edgegateway.go b/edgegateway.go
index 9c6a259..b7c4862 100644
--- a/edgegateway.go
+++ b/edgegateway.go
@@ -15,7 +15,7 @@ import (
 	"regexp"
 	"time"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type EdgeGateway struct {
diff --git a/edgegateway_test.go b/edgegateway_test.go
index 7fa8baa..973ddfb 100644
--- a/edgegateway_test.go
+++ b/edgegateway_test.go
@@ -5,8 +5,8 @@
 package govcloudair
 
 import (
-	"github.com/ukcloud/govcloudair/testutil"
-	types "github.com/ukcloud/govcloudair/types/v56"
+	"github.com/UKCloud/govcloudair/testutil"
+	types "github.com/UKCloud/govcloudair/types/v56"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/org.go b/org.go
index 5efc6b7..ceddcdd 100644
--- a/org.go
+++ b/org.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"net/url"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type Org struct {
diff --git a/orgvdcnetwork.go b/orgvdcnetwork.go
index 75187a8..d9f2a31 100644
--- a/orgvdcnetwork.go
+++ b/orgvdcnetwork.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 	"log"
 	"net/http"
 	"net/url"
diff --git a/orgvdcnetwork_test.go b/orgvdcnetwork_test.go
index e92fd72..a13756f 100644
--- a/orgvdcnetwork_test.go
+++ b/orgvdcnetwork_test.go
@@ -5,7 +5,7 @@
 package govcloudair
 
 import (
-	"github.com/ukcloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/testutil"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/query.go b/query.go
index 7ab2ebb..7113894 100644
--- a/query.go
+++ b/query.go
@@ -7,7 +7,7 @@ package govcloudair
 import (
 	"fmt"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type Results struct {
diff --git a/query_test.go b/query_test.go
index e657ad6..30942da 100644
--- a/query_test.go
+++ b/query_test.go
@@ -6,7 +6,7 @@ package govcloudair
 
 import (
 	// "fmt"
-	"github.com/ukcloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/testutil"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/task.go b/task.go
index 4c612be..f30278b 100644
--- a/task.go
+++ b/task.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"time"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type Task struct {
diff --git a/types/v56/types.go b/types/v56/types.go
index 103c67e..299c497 100644
--- a/types/v56/types.go
+++ b/types/v56/types.go
@@ -891,10 +891,11 @@ type VAppTemplate struct {
 	// CustomizationSection at least, NetworkConnectionSection is required when
 	// using ComposeVApp action in the context of a Children VM (still
 	// referenced by VAppTemplateType).
-	NetworkConfigSection     *NetworkConfigSection     `xml:"NetworkConfigSection,omitempty"`
-	NetworkConnectionSection *NetworkConnectionSection `xml:"NetworkConnectionSection,omitempty"`
-	LeaseSettingsSection     *LeaseSettingsSection     `xml:"LeaseSettingsSection,omitempty"`
-	CustomizationSection     *CustomizationSection     `xml:"CustomizationSection,omitempty"`
+	NetworkConfigSection       *NetworkConfigSection       `xml:"NetworkConfigSection,omitempty"`
+	NetworkConnectionSection   *NetworkConnectionSection   `xml:"NetworkConnectionSection,omitempty"`
+	LeaseSettingsSection       *LeaseSettingsSection       `xml:"LeaseSettingsSection,omitempty"`
+	CustomizationSection       *CustomizationSection       `xml:"CustomizationSection,omitempty"`
+	GuestCustomizationSection  *GuestCustomizationSection  `xml:"GuestCustomizationSection,omitempty"`
 	// OVF Section needs to be added
 	// Section               Section              `xml:"Section,omitempty"`
 }
diff --git a/v57/client.go b/v57/client.go
index 6d4c37b..38bcbd2 100644
--- a/v57/client.go
+++ b/v57/client.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 const (
diff --git a/vapp.go b/vapp.go
index e83dad8..17a6e09 100644
--- a/vapp.go
+++ b/vapp.go
@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"os"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 	"strconv"
 )
 
@@ -210,6 +210,13 @@ func (v *VApp) ComposeVApp(orgvdcnetworks []*types.OrgVDCNetwork, vapptemplate V
 				Name: vapptemplate.VAppTemplate.Children.VM[0].Name,
 			},
 			InstantiationParams: &types.InstantiationParams{
+				GuestCustomizationSection: &types.GuestCustomizationSection{
+					Type: vapptemplate.VAppTemplate.Children.VM[0].GuestCustomizationSection.Type,
+					HREF: vapptemplate.VAppTemplate.Children.VM[0].GuestCustomizationSection.HREF,
+					Info: "Guest customization for sourced item",
+					ComputerName: name,
+					Enabled: vapptemplate.VAppTemplate.Children.VM[0].GuestCustomizationSection.Enabled,
+				},
 				NetworkConnectionSection: &types.NetworkConnectionSection{
 					Type: vapptemplate.VAppTemplate.Children.VM[0].NetworkConnectionSection.Type,
 					HREF: vapptemplate.VAppTemplate.Children.VM[0].NetworkConnectionSection.HREF,
@@ -217,6 +224,9 @@ func (v *VApp) ComposeVApp(orgvdcnetworks []*types.OrgVDCNetwork, vapptemplate V
 					PrimaryNetworkConnectionIndex: vapptemplate.VAppTemplate.Children.VM[0].NetworkConnectionSection.PrimaryNetworkConnectionIndex,
 				},
 			},
+			VMGeneralParams: &types.VMGeneralParams{
+				Name: name,
+			},
 		},
 	}
 
diff --git a/vapp_test.go b/vapp_test.go
index 904ba04..41bdfe9 100644
--- a/vapp_test.go
+++ b/vapp_test.go
@@ -5,8 +5,8 @@
 package govcloudair
 
 import (
-	"github.com/ukcloud/govcloudair/testutil"
-	"github.com/ukcloud/govcloudair/types/v56"
+	"github.com/UKCloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/types/v56"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/vapptemplate.go b/vapptemplate.go
index 6b82444..ad68f40 100644
--- a/vapptemplate.go
+++ b/vapptemplate.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type VAppTemplate struct {
diff --git a/vdc.go b/vdc.go
index c7dd2b3..92d6211 100644
--- a/vdc.go
+++ b/vdc.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 	"log"
 	"net/url"
 	"os"
diff --git a/vdc_test.go b/vdc_test.go
index 82c3d16..f4370d9 100644
--- a/vdc_test.go
+++ b/vdc_test.go
@@ -5,7 +5,7 @@
 package govcloudair
 
 import (
-	"github.com/ukcloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/testutil"
 
 	. "gopkg.in/check.v1"
 	"strconv"
diff --git a/vm.go b/vm.go
index 0a48fd8..0399482 100644
--- a/vm.go
+++ b/vm.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"strconv"
 
-	types "github.com/ukcloud/govcloudair/types/v56"
+	types "github.com/UKCloud/govcloudair/types/v56"
 )
 
 type VM struct {
diff --git a/vm_test.go b/vm_test.go
index 19418d8..921eca0 100644
--- a/vm_test.go
+++ b/vm_test.go
@@ -6,7 +6,7 @@ package govcloudair
 
 import (
 	// "fmt"
-	"github.com/ukcloud/govcloudair/testutil"
+	"github.com/UKCloud/govcloudair/testutil"
 	. "gopkg.in/check.v1"
 )