diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
index 4056a105c..dbadeeba7 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/packageService.js
@@ -52,7 +52,7 @@ module.exports = {
   packageAll() {
     const exclude = this.getExcludes();
     const include = this.getIncludes();
-    const zipFileName = this.provider.naming.getServiceArtifactName();
+    const zipFileName = `${this.serverless.service.service}.zip`;
 
     return this.zipDirectory(exclude, include, zipFileName);
   },
@@ -63,7 +63,7 @@ module.exports = {
 
     const exclude = this.getExcludes(funcPackageConfig.exclude);
     const include = this.getIncludes(funcPackageConfig.include);
-    const zipFileName = this.provider.naming.getFunctionArtifactName(functionName);
+    const zipFileName = `${functionName}.zip`;
     return this.zipDirectory(exclude, include, zipFileName);
   },
 };