diff --git a/src/plugin.ts b/src/plugin.ts
index 0189df5..11c3a3b 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -27,10 +27,7 @@ export default class StackOutputPlugin {
   }
 
   get stackName () {
-    return util.format('%s-%s',
-      this.serverless.service.getServiceName(),
-      this.serverless.getProvider('aws').getStage()
-    )
+    return this.serverless.getProvider('aws').naming.getStackName()
   }
 
   private hasConfig (key: string) {
diff --git a/vendor/serverless.d.ts b/vendor/serverless.d.ts
index 897bdf0..59ed098 100644
--- a/vendor/serverless.d.ts
+++ b/vendor/serverless.d.ts
@@ -15,6 +15,10 @@ declare namespace Serverless {
       getStage: () => string
 
       request: (service: string, method: string, data: {}, stage: string, region: string) => Promise<any>
+
+      naming: {
+        getStackName(): string
+      }
     }
   }
 }