diff --git a/gulpfile.ts b/gulpfile.ts
index 0e3ba897d69d..34fb6b2712c2 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -161,6 +161,15 @@ gulp.task("build", () => {
   }
 });
 
+function containsPackageName(packageNames: string[], packageName: string): boolean {
+  return contains(packageNames, packageName) ||
+    contains(packageNames, `@azure/${packageName}`) ||
+    contains(packageNames, `"${packageName}"`) ||
+    contains(packageNames, `"@azure/${packageName}"`) ||
+    contains(packageNames, `'${packageName}'`) ||
+    contains(packageNames, `'@azure/${packageName}'`);
+}
+
 // This task is used to generate libraries based on the mappings specified above.
 gulp.task('codegen', () => {
   const typeScriptReadmeFilePaths: string[] = findReadmeTypeScriptMdFilePaths(azureRestAPISpecsRoot);
@@ -173,7 +182,7 @@ gulp.task('codegen', () => {
     const packageNamesString: string = JSON.stringify(packageNames);
     // console.log(`In "${typeScriptReadmeFilePath}", found package names "${packageNamesString}".`);
 
-    if (!packageArg || contains(packageNames, packageArg)) {
+    if (!packageArg || containsPackageName(packageNames, packageArg)) {
       console.log(`>>>>>>>>>>>>>>>>>>> Start: "${packageNamesString}" >>>>>>>>>>>>>>>>>>>>>>>>>`);
 
       const readmeFilePath: string = path.resolve(path.dirname(typeScriptReadmeFilePath), 'readme.md');
diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json
index da05c7f3675b..d48b5b0232fa 100644
--- a/swagger_to_sdk_config.json
+++ b/swagger_to_sdk_config.json
@@ -5,7 +5,7 @@
       "typescript": "",
       "license-header": "MICROSOFT_MIT_NO_VERSION",
       "sdkrel:node-sdks-folder": ".",
-      "use": "@microsoft.azure/autorest.typescript@2.0.516"
+      "use": "@microsoft.azure/autorest.typescript@2.0.558"
     },
     "advanced_options": {
       "clone_dir": "./azure-sdk-for-js"