diff --git a/rushScripts/regeneration.js b/rushScripts/regeneration.js
index 79785de94..c8443913a 100644
--- a/rushScripts/regeneration.js
+++ b/rushScripts/regeneration.js
@@ -50,7 +50,7 @@ for (namespace in goMappings) {
 } 
 
 const blobStorage = 'https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-07-07/blob.json';
-generate(blobStorage, 'test/storage/2019-07-07/azblob', '--credential-scope="https://storage.azure.com/.default" --module="azstorage" --export-client="false"');
+generate(blobStorage, 'test/storage/2019-07-07/azblob', '--credential-scope="https://storage.azure.com/.default" --module="azstorage" --export-client="false" --file-prefix="zz_generated_"');
 
 // helper to log the package being generated before invocation
 function generate(inputFile, outputDir, additionalArgs) {
diff --git a/src/generator/generator.ts b/src/generator/generator.ts
index 8ff57c248..92ef8647b 100644
--- a/src/generator/generator.ts
+++ b/src/generator/generator.ts
@@ -22,48 +22,52 @@ export async function protocolGen(host: Host) {
   const debug = await host.GetValue('debug') || false;
 
   try {
-
     // get the code model from the core
     const session = await startSession<CodeModel>(host, codeModelSchema);
     const operations = await generateOperations(session);
+    let filePrefix = await session.getValue('file-prefix', '');
+    // if a file prefix was specified, ensure it's properly snaked
+    if (filePrefix.length > 0 && filePrefix[filePrefix.length - 1] !== '_') {
+      filePrefix += '_';
+    }
 
     // output the model to the pipeline.  this must happen after all model
     // updates are complete and before any source files are written.
     host.WriteFile('code-model-v4.yaml', serialize(session.model), undefined, 'code-model-v4');
 
     for (const op of values(operations)) {
-      host.WriteFile(`${op.name.toLowerCase()}.go`, op.content, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}${op.name.toLowerCase()}.go`, op.content, undefined, 'source-file-go');
     }
 
     const enums = await generateEnums(session);
     if (enums.length > 0) {
-      host.WriteFile('enums.go', enums, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}enums.go`, enums, undefined, 'source-file-go');
     }
 
     const models = await generateModels(session);
-    host.WriteFile('models.go', models, undefined, 'source-file-go');
+    host.WriteFile(`${filePrefix}models.go`, models, undefined, 'source-file-go');
 
     const client = await generateClient(session);
-    host.WriteFile('client.go', client, undefined, 'source-file-go');
+    host.WriteFile(`${filePrefix}client.go`, client, undefined, 'source-file-go');
 
     const timeHelpers = await generateTimeHelpers(session);
     for (const helper of values(timeHelpers)) {
-      host.WriteFile(`${helper.name.toLowerCase()}.go`, helper.content, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}${helper.name.toLowerCase()}.go`, helper.content, undefined, 'source-file-go');
     }
 
     const pagers = await generatePagers(session);
     if (pagers.length > 0) {
-      host.WriteFile('pagers.go', pagers, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}pagers.go`, pagers, undefined, 'source-file-go');
     }
     const pollers = await generatePollers(session);
     if (pollers.length > 0) {
       const pollingHelper = await generatePollersHelper(session);
-      host.WriteFile('pollers_helper.go', pollingHelper, undefined, 'source-file-go');
-      host.WriteFile('pollers.go', pollers, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}pollers_helper.go`, pollingHelper, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}pollers.go`, pollers, undefined, 'source-file-go');
     }
     const polymorphics = await generatePolymorphicHelpers(session);
     if (polymorphics.length > 0) {
-      host.WriteFile('polymorphic_helpers.go', polymorphics, undefined, 'source-file-go');
+      host.WriteFile(`${filePrefix}polymorphic_helpers.go`, polymorphics, undefined, 'source-file-go');
     }
     const gomod = await generateGoModFile(session);
     if (gomod.length > 0) {
diff --git a/src/generator/gomod.ts b/src/generator/gomod.ts
index c36c5b8cd..ec6947c6a 100644
--- a/src/generator/gomod.ts
+++ b/src/generator/gomod.ts
@@ -16,6 +16,6 @@ export async function generateGoModFile(session: Session<CodeModel>): Promise<st
   text += 'go 1.13\n\n';
   // here we specify the minimum version of azcore as required by the code generator
   // TODO: come up with a way to get the latest minor/patch version.
-  text += 'require github.com/Azure/azure-sdk-for-go/sdk/azcore v0.8.0\n';
+  text += 'require github.com/Azure/azure-sdk-for-go/sdk/azcore v0.8.2\n';
   return text;
 }
diff --git a/test/storage/2019-07-07/azblob/go.mod b/test/storage/2019-07-07/azblob/go.mod
index d10b5565f..c89eb3b06 100644
--- a/test/storage/2019-07-07/azblob/go.mod
+++ b/test/storage/2019-07-07/azblob/go.mod
@@ -2,4 +2,4 @@ module azstorage
 
 go 1.13
 
-require github.com/Azure/azure-sdk-for-go/sdk/azcore v0.8.0
+require github.com/Azure/azure-sdk-for-go/sdk/azcore v0.8.2
diff --git a/test/storage/2019-07-07/azblob/appendblob.go b/test/storage/2019-07-07/azblob/zz_generated_appendblob.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/appendblob.go
rename to test/storage/2019-07-07/azblob/zz_generated_appendblob.go
diff --git a/test/storage/2019-07-07/azblob/blob.go b/test/storage/2019-07-07/azblob/zz_generated_blob.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/blob.go
rename to test/storage/2019-07-07/azblob/zz_generated_blob.go
diff --git a/test/storage/2019-07-07/azblob/blockblob.go b/test/storage/2019-07-07/azblob/zz_generated_blockblob.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/blockblob.go
rename to test/storage/2019-07-07/azblob/zz_generated_blockblob.go
diff --git a/test/storage/2019-07-07/azblob/client.go b/test/storage/2019-07-07/azblob/zz_generated_client.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/client.go
rename to test/storage/2019-07-07/azblob/zz_generated_client.go
diff --git a/test/storage/2019-07-07/azblob/container.go b/test/storage/2019-07-07/azblob/zz_generated_container.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/container.go
rename to test/storage/2019-07-07/azblob/zz_generated_container.go
diff --git a/test/storage/2019-07-07/azblob/directory.go b/test/storage/2019-07-07/azblob/zz_generated_directory.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/directory.go
rename to test/storage/2019-07-07/azblob/zz_generated_directory.go
diff --git a/test/storage/2019-07-07/azblob/enums.go b/test/storage/2019-07-07/azblob/zz_generated_enums.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/enums.go
rename to test/storage/2019-07-07/azblob/zz_generated_enums.go
diff --git a/test/storage/2019-07-07/azblob/models.go b/test/storage/2019-07-07/azblob/zz_generated_models.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/models.go
rename to test/storage/2019-07-07/azblob/zz_generated_models.go
diff --git a/test/storage/2019-07-07/azblob/pageblob.go b/test/storage/2019-07-07/azblob/zz_generated_pageblob.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/pageblob.go
rename to test/storage/2019-07-07/azblob/zz_generated_pageblob.go
diff --git a/test/storage/2019-07-07/azblob/pagers.go b/test/storage/2019-07-07/azblob/zz_generated_pagers.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/pagers.go
rename to test/storage/2019-07-07/azblob/zz_generated_pagers.go
diff --git a/test/storage/2019-07-07/azblob/service.go b/test/storage/2019-07-07/azblob/zz_generated_service.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/service.go
rename to test/storage/2019-07-07/azblob/zz_generated_service.go
diff --git a/test/storage/2019-07-07/azblob/time_rfc1123.go b/test/storage/2019-07-07/azblob/zz_generated_time_rfc1123.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/time_rfc1123.go
rename to test/storage/2019-07-07/azblob/zz_generated_time_rfc1123.go
diff --git a/test/storage/2019-07-07/azblob/time_rfc3339.go b/test/storage/2019-07-07/azblob/zz_generated_time_rfc3339.go
similarity index 100%
rename from test/storage/2019-07-07/azblob/time_rfc3339.go
rename to test/storage/2019-07-07/azblob/zz_generated_time_rfc3339.go