7 files changed, 9 insertions, 9 deletions
diff --git a/services/common/storageservice.js b/services/common/storageservice.js
index 1cb8b3f6b..0664eadae 100644
--- a/services/common/storageservice.js
+++ b/services/common/storageservice.js
@@ -251,7 +251,7 @@ BasicStorageObject.prototype = {
  *     smaller batches.
  *
  *   network - A network error prevented this request from succeeding. If set,
- *     it will be an Error thrown by the Gecko network stack. If set, it could
+ *     it will be an Error thrown by the Goanna network stack. If set, it could
  *     mean that the request could not be performed or that an error occurred
  *     when the request was in flight. It is also possible the request
  *     succeeded on the server but the response was lost in transit.
diff --git a/services/datareporting/README.rst b/services/datareporting/README.rst
index 85fccfff2..80ca12093 100644
--- a/services/datareporting/README.rst
+++ b/services/datareporting/README.rst
@@ -3,7 +3,7 @@ Data Reporting Service
 ======================
 
 This directory contains files related to data collection and reporting
-within Gecko applications.
+within Goanna applications.
 
 The important files in this directory are:
 
@@ -15,7 +15,7 @@ policy.jsm
   and upload of data.
 
 sessions.jsm
-  Records Gecko application session history. This is loaded as part of
+  Records Goanna application session history. This is loaded as part of
   the XPCOM service because it needs to capture state from very early in
   the application lifecycle. Bug 841561 tracks implementing this in C++.
 
diff --git a/services/datareporting/policy.jsm b/services/datareporting/policy.jsm
index ac9364427..a8a4c1cd8 100644
--- a/services/datareporting/policy.jsm
+++ b/services/datareporting/policy.jsm
@@ -5,7 +5,7 @@
 /**
  * This file is in transition. It was originally conceived to fulfill the
  * needs of only Firefox Health Report. It is slowly being morphed into
- * fulfilling the needs of all data reporting facilities in Gecko applications.
+ * fulfilling the needs of all data reporting facilities in Goanna applications.
  * As a result, some things feel a bit weird.
  *
  * DataReportingPolicy is both a driver for data reporting notification
diff --git a/services/healthreport/healthreporter.jsm b/services/healthreport/healthreporter.jsm
index 6d299a251..b3fcc83e8 100644
--- a/services/healthreport/healthreporter.jsm
+++ b/services/healthreport/healthreporter.jsm
@@ -249,7 +249,7 @@ HealthReporterState.prototype = Object.freeze({
 /**
  * This is the abstract base class of `HealthReporter`. It exists so that
  * we can sanely divide work on platforms where control of Firefox Health
- * Report is outside of Gecko (e.g., Android).
+ * Report is outside of Goanna (e.g., Android).
  */
 function AbstractHealthReporter(branch, policy, sessionRecorder) {
   if (!branch.endsWith(".")) {
@@ -898,7 +898,7 @@ AbstractHealthReporter.prototype = Object.freeze({
     let o = {
       version: 2,
       thisPingDate: pingDateString,
-      geckoAppInfo: this.obtainAppInfo(this._log),
+      goannaAppInfo: this.obtainAppInfo(this._log),
       data: {last: {}, days: {}},
     };
 
diff --git a/services/healthreport/providers.jsm b/services/healthreport/providers.jsm
index 6409723bf..2778757ae 100644
--- a/services/healthreport/providers.jsm
+++ b/services/healthreport/providers.jsm
@@ -215,7 +215,7 @@ AppInfoProvider.prototype = Object.freeze({
     }.bind(this);
 
     // Services.appInfo should always be defined for any reasonably behaving
-    // Gecko app. If it isn't, we insert a empty string sentinel value.
+    // Goanna app. If it isn't, we insert a empty string sentinel value.
     let ai;
     try {
       ai = Services.appinfo;
diff --git a/services/healthreport/tests/xpcshell/test_healthreporter.js b/services/healthreport/tests/xpcshell/test_healthreporter.js
index 2c4f1f234..8072a20e0 100644
--- a/services/healthreport/tests/xpcshell/test_healthreporter.js
+++ b/services/healthreport/tests/xpcshell/test_healthreporter.js
@@ -786,7 +786,7 @@ add_task(function test_basic_appinfo() {
     verify(reporter.obtainAppInfo());
     let payload = yield reporter.collectAndObtainJSONPayload(true);
     do_check_eq(payload["version"], 2);
-    verify(payload["geckoAppInfo"]);
+    verify(payload["goannaAppInfo"]);
   } finally {
     reporter._shutdown();
   }
diff --git a/services/metrics/README.rst b/services/metrics/README.rst
index 8775a69ea..f0f637376 100644
--- a/services/metrics/README.rst
+++ b/services/metrics/README.rst
@@ -3,7 +3,7 @@ Metrics Collection Framework
 ============================
 
 This directory contains generic code for collecting and persisting
-metrics data for Gecko applications.
+metrics data for Goanna applications.
 
 Overview
 ========