diff --git a/src/trace-writer.js b/src/trace-writer.js
index 52c820561..a21e6ef34 100644
--- a/src/trace-writer.js
+++ b/src/trace-writer.js
@@ -78,10 +78,10 @@ function TraceWriter(logger, options) {
       if (instanceId) {
         labels[traceLabels.GCE_INSTANCE_ID] = instanceId;
       }
-      var moduleName = process.env.GAE_MODULE_NAME || hostname;
+      var moduleName = process.env.GAE_SERVICE || process.env.GAE_MODULE_NAME || hostname;
       labels[traceLabels.GAE_MODULE_NAME] = moduleName;
 
-      var moduleVersion = process.env.GAE_MODULE_VERSION;
+      var moduleVersion = process.env.GAE_VERSION || process.env.GAE_MODULE_VERSION;
       if (moduleVersion) {
         labels[traceLabels.GAE_MODULE_VERSION] = moduleVersion;
         var minorVersion = process.env.GAE_MINOR_VERSION;
diff --git a/test/test-agent-metadata.js b/test/test-agent-metadata.js
index 766d64675..7b8710cd7 100644
--- a/test/test-agent-metadata.js
+++ b/test/test-agent-metadata.js
@@ -188,6 +188,7 @@ describe('agent interaction with metadata service', function() {
                   .reply(200, 'host');
 
       delete process.env.GAE_MODULE_NAME;
+      delete process.env.GAE_SERVICE;
       agent = trace.start({projectId: '0', logLevel: 0, forceNewAgent_: true});
       setTimeout(function() {
         common.runInTransaction(agent, function(end) {
@@ -210,6 +211,7 @@ describe('agent interaction with metadata service', function() {
                   .reply(404);
 
       delete process.env.GAE_MODULE_NAME;
+      delete process.env.GAE_SERVICE;
       agent = trace.start({projectId: '0', logLevel: 0, forceNewAgent_: true});
       setTimeout(function() {
         common.runInTransaction(agent, function(end) {