diff --git a/src/main/resources/com/google/api/codegen/nodejs/README.md.snip b/src/main/resources/com/google/api/codegen/nodejs/README.md.snip
index 1322d7e70d..0b55c1325d 100644
--- a/src/main/resources/com/google/api/codegen/nodejs/README.md.snip
+++ b/src/main/resources/com/google/api/codegen/nodejs/README.md.snip
@@ -19,5 +19,5 @@
 @end
 
 @private installationLines(metadata)
-  $ npm install {@metadata.identifier}
+  $ npm install --save {@metadata.identifier}
 @end
diff --git a/src/main/resources/com/google/api/codegen/nodejs/package.json.snip b/src/main/resources/com/google/api/codegen/nodejs/package.json.snip
index b47ef0eb58..2b38ffad42 100644
--- a/src/main/resources/com/google/api/codegen/nodejs/package.json.snip
+++ b/src/main/resources/com/google/api/codegen/nodejs/package.json.snip
@@ -5,7 +5,6 @@
     "version": "{@metadata.packageVersionBound.lower}",
     "author": "{@metadata.author}",
     "description": "{@metadata.fullName} client for Node.js",
-    "url": "{@metadata.homepage}",
     "main": "src/index.js",
     "files": [
       "src",
diff --git a/src/main/resources/com/google/api/codegen/nodejs/version_index.snip b/src/main/resources/com/google/api/codegen/nodejs/version_index.snip
index b2552c11c9..0c88d8d51a 100644
--- a/src/main/resources/com/google/api/codegen/nodejs/version_index.snip
+++ b/src/main/resources/com/google/api/codegen/nodejs/version_index.snip
@@ -46,8 +46,10 @@
     {@comments(@service.doc.lines)}
     *
     * @@param {object=} options - [Configuration object](#/docs).
-    * @@param {number=} options.port - The port on which to connect to the remote host.
-    * @@param {string=} options.servicePath - The domain name of the API remote host.
+    * @@param {number=} options.port - The port on which to connect to
+    *     the remote host.
+    * @@param {string=} options.servicePath - The domain name of the
+    *     API remote host.
     */
    function {@service.localName}(options) {
      // Define the header options.
diff --git a/src/main/resources/com/google/api/codegen/readme.snip b/src/main/resources/com/google/api/codegen/readme.snip
index 989fbee87f..3afaf2b9a7 100644
--- a/src/main/resources/com/google/api/codegen/readme.snip
+++ b/src/main/resources/com/google/api/codegen/readme.snip
@@ -25,7 +25,7 @@
   In order to use this library, you first need to go through the following steps:
 
   1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-  2. [Enable the {@metadata.shortName} api.](https://console.cloud.google.com/apis/api/{@metadata.shortName})
+  2. [Enable the {@metadata.fullName}.](https://console.cloud.google.com/apis/api/{@metadata.shortName})
   3. [Setup Authentication.]({@metadata.authDocumentationLink})
 
   @if installationLines
diff --git a/src/main/resources/com/google/api/codegen/readme_rst.snip b/src/main/resources/com/google/api/codegen/readme_rst.snip
index 80a730e50e..3d32213172 100644
--- a/src/main/resources/com/google/api/codegen/readme_rst.snip
+++ b/src/main/resources/com/google/api/codegen/readme_rst.snip
@@ -32,11 +32,11 @@
   In order to use this library, you first need to go through the following steps:
 
   1. `Select or create a Cloud Platform project.`_
-  2. `Enable the monitoring api.`_
+  2. `Enable the {@metadata.fullName}.`_
   3. `Setup Authentication.`_
 
   .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
-  .. _Enable the {@metadata.shortName} api.:  {@productDocumentation(metadata)}
+  .. _Enable the {@metadata.fullName}.:  {@productDocumentation(metadata)}
   .. _Setup Authentication.: {@metadata.authDocumentationLink}
 
   @if installationLines
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_README_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_README_library.baseline
index cf40bdf2d8..2126b9ec2d 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_README_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_README_library.baseline
@@ -9,12 +9,12 @@ Idiomatic Node.js client for [Google Example Library API][Product Documentation]
 In order to use this library, you first need to go through the following steps:
 
 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-2. [Enable the library api.](https://console.cloud.google.com/apis/api/library)
+2. [Enable the Google Example Library API.](https://console.cloud.google.com/apis/api/library)
 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-node/#/docs/google-cloud/master/guides/authentication)
 
 ### Installation
 ```
-$ npm install @google-cloud/library
+$ npm install --save @google-cloud/library
 ```
 
 ### Preview
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_README_no_path_templates.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_README_no_path_templates.baseline
index 9f22faef0b..3dbdcc8a09 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_README_no_path_templates.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_README_no_path_templates.baseline
@@ -9,12 +9,12 @@ Idiomatic Node.js client for [Google Fake API][Product Documentation]
 In order to use this library, you first need to go through the following steps:
 
 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-2. [Enable the library api.](https://console.cloud.google.com/apis/api/library)
+2. [Enable the Google Fake API.](https://console.cloud.google.com/apis/api/library)
 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-node/#/docs/google-cloud/master/guides/authentication)
 
 ### Installation
 ```
-$ npm install example
+$ npm install --save example
 ```
 
 ### Next Steps
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_README_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_README_library.baseline
index cf40bdf2d8..2126b9ec2d 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_README_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_README_library.baseline
@@ -9,12 +9,12 @@ Idiomatic Node.js client for [Google Example Library API][Product Documentation]
 In order to use this library, you first need to go through the following steps:
 
 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-2. [Enable the library api.](https://console.cloud.google.com/apis/api/library)
+2. [Enable the Google Example Library API.](https://console.cloud.google.com/apis/api/library)
 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-node/#/docs/google-cloud/master/guides/authentication)
 
 ### Installation
 ```
-$ npm install @google-cloud/library
+$ npm install --save @google-cloud/library
 ```
 
 ### Preview
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_package_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_package_library.baseline
index 126726d1fa..b17124184f 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_package_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_package_library.baseline
@@ -5,7 +5,6 @@
   "version": "0.7.1",
   "author": "Google, Inc.",
   "description": "Google Example Library API client for Node.js",
-  "url": "https://github.com/googleapis/googleapis",
   "main": "src/index.js",
   "files": [
     "src",
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_version_index_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_version_index_library.baseline
index fbfdc120c6..1e9c2ed3fc 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_doc_version_index_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_doc_version_index_library.baseline
@@ -43,8 +43,10 @@ const VERSION = require('../package.json').version;
  * Service comment may include special characters: <>&"`'@.
  *
  * @param {object=} options - [Configuration object](#/docs).
- * @param {number=} options.port - The port on which to connect to the remote host.
- * @param {string=} options.servicePath - The domain name of the API remote host.
+ * @param {number=} options.port - The port on which to connect to
+ *     the remote host.
+ * @param {string=} options.servicePath - The domain name of the
+ *     API remote host.
  */
 function libraryV1(options) {
   // Define the header options.
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_package_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_package_library.baseline
index 126726d1fa..b17124184f 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_package_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_package_library.baseline
@@ -5,7 +5,6 @@
   "version": "0.7.1",
   "author": "Google, Inc.",
   "description": "Google Example Library API client for Node.js",
-  "url": "https://github.com/googleapis/googleapis",
   "main": "src/index.js",
   "files": [
     "src",
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_package_no_path_templates.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_package_no_path_templates.baseline
index 0665ec5f21..ac4556299f 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_package_no_path_templates.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_package_no_path_templates.baseline
@@ -5,7 +5,6 @@
   "version": "0.7.1",
   "author": "Google, Inc.",
   "description": "Google Fake API client for Node.js",
-  "url": "https://github.com/googleapis/googleapis",
   "main": "src/index.js",
   "files": [
     "src",
diff --git a/src/test/java/com/google/api/codegen/testdata/nodejs_version_index_library.baseline b/src/test/java/com/google/api/codegen/testdata/nodejs_version_index_library.baseline
index fbfdc120c6..1e9c2ed3fc 100644
--- a/src/test/java/com/google/api/codegen/testdata/nodejs_version_index_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/nodejs_version_index_library.baseline
@@ -43,8 +43,10 @@ const VERSION = require('../package.json').version;
  * Service comment may include special characters: <>&"`'@.
  *
  * @param {object=} options - [Configuration object](#/docs).
- * @param {number=} options.port - The port on which to connect to the remote host.
- * @param {string=} options.servicePath - The domain name of the API remote host.
+ * @param {number=} options.port - The port on which to connect to
+ *     the remote host.
+ * @param {string=} options.servicePath - The domain name of the
+ *     API remote host.
  */
 function libraryV1(options) {
   // Define the header options.
diff --git a/src/test/java/com/google/api/codegen/testdata/python_README_library.baseline b/src/test/java/com/google/api/codegen/testdata/python_README_library.baseline
index 9079d7b606..09bf685008 100644
--- a/src/test/java/com/google/api/codegen/testdata/python_README_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/python_README_library.baseline
@@ -18,11 +18,11 @@ Quick Start
 In order to use this library, you first need to go through the following steps:
 
 1. `Select or create a Cloud Platform project.`_
-2. `Enable the monitoring api.`_
+2. `Enable the Google Example Library API.`_
 3. `Setup Authentication.`_
 
 .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
-.. _Enable the library api.:  https://cloud.google.com/library
+.. _Enable the Google Example Library API.:  https://cloud.google.com/library
 .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-auth
 
 Installation
diff --git a/src/test/java/com/google/api/codegen/testdata/python_README_no_path_templates.baseline b/src/test/java/com/google/api/codegen/testdata/python_README_no_path_templates.baseline
index 293da3a8db..a31790f0c2 100644
--- a/src/test/java/com/google/api/codegen/testdata/python_README_no_path_templates.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/python_README_no_path_templates.baseline
@@ -18,11 +18,11 @@ Quick Start
 In order to use this library, you first need to go through the following steps:
 
 1. `Select or create a Cloud Platform project.`_
-2. `Enable the monitoring api.`_
+2. `Enable the Google Fake API.`_
 3. `Setup Authentication.`_
 
 .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
-.. _Enable the library api.:  https://cloud.google.com/library
+.. _Enable the Google Fake API.:  https://cloud.google.com/library
 .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-auth
 
 Installation
diff --git a/src/test/java/com/google/api/codegen/testdata/python_doc_README_library.baseline b/src/test/java/com/google/api/codegen/testdata/python_doc_README_library.baseline
index 9079d7b606..09bf685008 100644
--- a/src/test/java/com/google/api/codegen/testdata/python_doc_README_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/python_doc_README_library.baseline
@@ -18,11 +18,11 @@ Quick Start
 In order to use this library, you first need to go through the following steps:
 
 1. `Select or create a Cloud Platform project.`_
-2. `Enable the monitoring api.`_
+2. `Enable the Google Example Library API.`_
 3. `Setup Authentication.`_
 
 .. _Select or create a Cloud Platform project.: https://console.cloud.google.com/project
-.. _Enable the library api.:  https://cloud.google.com/library
+.. _Enable the Google Example Library API.:  https://cloud.google.com/library
 .. _Setup Authentication.: https://googlecloudplatform.github.io/google-cloud-python/stable/google-cloud-auth
 
 Installation
diff --git a/src/test/java/com/google/api/codegen/testdata/ruby_README_library.baseline b/src/test/java/com/google/api/codegen/testdata/ruby_README_library.baseline
index 99dae8fc75..e5f5983c3c 100644
--- a/src/test/java/com/google/api/codegen/testdata/ruby_README_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/ruby_README_library.baseline
@@ -9,7 +9,7 @@ Idiomatic Ruby client for [Google Example Library API][Product Documentation]
 In order to use this library, you first need to go through the following steps:
 
 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-2. [Enable the library api.](https://console.cloud.google.com/apis/api/library)
+2. [Enable the Google Example Library API.](https://console.cloud.google.com/apis/api/library)
 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
 
 ### Installation
diff --git a/src/test/java/com/google/api/codegen/testdata/ruby_doc_README_library.baseline b/src/test/java/com/google/api/codegen/testdata/ruby_doc_README_library.baseline
index 99dae8fc75..e5f5983c3c 100644
--- a/src/test/java/com/google/api/codegen/testdata/ruby_doc_README_library.baseline
+++ b/src/test/java/com/google/api/codegen/testdata/ruby_doc_README_library.baseline
@@ -9,7 +9,7 @@ Idiomatic Ruby client for [Google Example Library API][Product Documentation]
 In order to use this library, you first need to go through the following steps:
 
 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-2. [Enable the library api.](https://console.cloud.google.com/apis/api/library)
+2. [Enable the Google Example Library API.](https://console.cloud.google.com/apis/api/library)
 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
 
 ### Installation