diff --git a/packages/basic-auth/lib/basic-auth-construct.ts b/packages/basic-auth/lib/basic-auth-construct.ts
index 2c954f55..e27afd3c 100644
--- a/packages/basic-auth/lib/basic-auth-construct.ts
+++ b/packages/basic-auth/lib/basic-auth-construct.ts
@@ -45,7 +45,7 @@ export class BasicAuthFunction extends Construct {
   public getFunctionVersion(): IVersion {
     return Version.fromVersionArn(
       this,
-      "basic-auth-function-version",
+      "basic-auth-fn-version",
       this.edgeFunction.currentVersion.edgeArn
     );
   }
diff --git a/packages/static-hosting/lib/path-remap.ts b/packages/static-hosting/lib/path-remap.ts
index bce4bea1..86ebe59f 100644
--- a/packages/static-hosting/lib/path-remap.ts
+++ b/packages/static-hosting/lib/path-remap.ts
@@ -23,7 +23,7 @@ export class PathRemapFunction extends Construct {
 
     this.edgeFunction = new cf.experimental.EdgeFunction(
       this,
-      `${id}-edge-function`,
+      `${id}-remap-fn`,
       {
         code: Code.fromAsset(join(__dirname, "handlers"), {
           assetHashType: AssetHashType.OUTPUT,
@@ -47,7 +47,7 @@ export class PathRemapFunction extends Construct {
   public getFunctionVersion(): IVersion {
     return Version.fromVersionArn(
       this,
-      "remap-function-version",
+      "remap-fn-version",
       this.edgeFunction.currentVersion.edgeArn
     );
   }