diff --git a/services/preview/compute/mgmt/2016-04-30-preview/compute/computeapi/interfaces.go b/services/preview/compute/mgmt/2016-04-30-preview/compute/computeapi/interfaces.go
index 21425a74f457..ff7415213483 100644
--- a/services/preview/compute/mgmt/2016-04-30-preview/compute/computeapi/interfaces.go
+++ b/services/preview/compute/mgmt/2016-04-30-preview/compute/computeapi/interfaces.go
@@ -81,7 +81,7 @@ var _ VirtualMachinesClientAPI = (*compute.VirtualMachinesClient)(nil)
 // VirtualMachineImagesClientAPI contains the set of methods on the VirtualMachineImagesClient type.
 type VirtualMachineImagesClientAPI interface {
 	Get(ctx context.Context, location string, publisherName string, offer string, skus string, version string) (result compute.VirtualMachineImage, err error)
-	List(ctx context.Context, location string, publisherName string, offer string, skus string, filter string, top *int32, orderby string) (result compute.ListVirtualMachineImageResource, err error)
+	List(ctx context.Context, location string, publisherName string, offer string, skus string, expand string, top *int32, orderby string) (result compute.ListVirtualMachineImageResource, err error)
 	ListOffers(ctx context.Context, location string, publisherName string) (result compute.ListVirtualMachineImageResource, err error)
 	ListPublishers(ctx context.Context, location string) (result compute.ListVirtualMachineImageResource, err error)
 	ListSkus(ctx context.Context, location string, publisherName string, offer string) (result compute.ListVirtualMachineImageResource, err error)
diff --git a/services/preview/compute/mgmt/2016-04-30-preview/compute/version.go b/services/preview/compute/mgmt/2016-04-30-preview/compute/version.go
index 70acf09227eb..28c1c8d6a92a 100644
--- a/services/preview/compute/mgmt/2016-04-30-preview/compute/version.go
+++ b/services/preview/compute/mgmt/2016-04-30-preview/compute/version.go
@@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " compute/2016-04-30-preview"
+	return "Azure-SDK-For-Go/" + Version() + " compute/2016-04-30-preview"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
diff --git a/services/preview/compute/mgmt/2016-04-30-preview/compute/virtualmachineimages.go b/services/preview/compute/mgmt/2016-04-30-preview/compute/virtualmachineimages.go
index 012749a4ab11..12543ccfa83c 100644
--- a/services/preview/compute/mgmt/2016-04-30-preview/compute/virtualmachineimages.go
+++ b/services/preview/compute/mgmt/2016-04-30-preview/compute/virtualmachineimages.go
@@ -130,8 +130,8 @@ func (client VirtualMachineImagesClient) GetResponder(resp *http.Response) (resu
 // publisherName - a valid image publisher.
 // offer - a valid image publisher offer.
 // skus - a valid image SKU.
-// filter - the filter to apply on the operation.
-func (client VirtualMachineImagesClient) List(ctx context.Context, location string, publisherName string, offer string, skus string, filter string, top *int32, orderby string) (result ListVirtualMachineImageResource, err error) {
+// expand - the expand expression to apply on the operation.
+func (client VirtualMachineImagesClient) List(ctx context.Context, location string, publisherName string, offer string, skus string, expand string, top *int32, orderby string) (result ListVirtualMachineImageResource, err error) {
 	if tracing.IsEnabled() {
 		ctx = tracing.StartSpan(ctx, fqdn+"/VirtualMachineImagesClient.List")
 		defer func() {
@@ -142,7 +142,7 @@ func (client VirtualMachineImagesClient) List(ctx context.Context, location stri
 			tracing.EndSpan(ctx, sc, err)
 		}()
 	}
-	req, err := client.ListPreparer(ctx, location, publisherName, offer, skus, filter, top, orderby)
+	req, err := client.ListPreparer(ctx, location, publisherName, offer, skus, expand, top, orderby)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "compute.VirtualMachineImagesClient", "List", nil, "Failure preparing request")
 		return
@@ -164,7 +164,7 @@ func (client VirtualMachineImagesClient) List(ctx context.Context, location stri
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualMachineImagesClient) ListPreparer(ctx context.Context, location string, publisherName string, offer string, skus string, filter string, top *int32, orderby string) (*http.Request, error) {
+func (client VirtualMachineImagesClient) ListPreparer(ctx context.Context, location string, publisherName string, offer string, skus string, expand string, top *int32, orderby string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"offer":          autorest.Encode("path", offer),
@@ -177,8 +177,8 @@ func (client VirtualMachineImagesClient) ListPreparer(ctx context.Context, locat
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
-	if len(filter) > 0 {
-		queryParameters["$filter"] = autorest.Encode("query", filter)
+	if len(expand) > 0 {
+		queryParameters["$expand"] = autorest.Encode("query", expand)
 	}
 	if top != nil {
 		queryParameters["$top"] = autorest.Encode("query", *top)