diff --git a/discounts/javascript/discount/default/shopify.extension.toml.liquid b/discounts/javascript/discount/default/shopify.extension.toml.liquid
index a5b77025..5f237176 100644
--- a/discounts/javascript/discount/default/shopify.extension.toml.liquid
+++ b/discounts/javascript/discount/default/shopify.extension.toml.liquid
@@ -9,13 +9,13 @@ description = "t:description"
 
   [[extensions.targeting]]
   target = "cart.lines.discounts.generate.run"
-  input_query = "src/generate_cart_run.graphql"
-  export = "generate-cart-run"
+  input_query = "src/cart_lines_discounts_generate_run.graphql"
+  export = "cart-lines-discounts-generate-run"
 
   [[extensions.targeting]]
   target = "cart.delivery-options.discounts.generate.run"
-  input_query = "src/generate_delivery_run.graphql"
-  export = "generate-delivery-run"
+  input_query = "src/cart_delivery_options_discounts_generate_run.graphql"
+  export = "cart-delivery-options-discounts-generate-run"
 
   [extensions.build]
   command = ""
diff --git a/discounts/javascript/discount/default/src/generate_delivery_run.graphql.liquid b/discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.graphql.liquid
similarity index 100%
rename from discounts/javascript/discount/default/src/generate_delivery_run.graphql.liquid
rename to discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.graphql.liquid
diff --git a/discounts/javascript/discount/default/src/generate_delivery_run.liquid b/discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.liquid
similarity index 93%
rename from discounts/javascript/discount/default/src/generate_delivery_run.liquid
rename to discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.liquid
index 59524b82..baf67f31 100644
--- a/discounts/javascript/discount/default/src/generate_delivery_run.liquid
+++ b/discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.liquid
@@ -8,11 +8,11 @@ import {  DeliveryDiscountSelectionStrategy} from '../generated/api';
  * @typedef {import("../generated/api").CartDeliveryOptionsDiscountsGenerateRunResult} CartDeliveryOptionsDiscountsGenerateRunResult
  */
 /**
- * generateDeliveryRun
+ * cartDeliveryOptionsDiscountsGenerateRun
  * @param {RunInput} input - The DeliveryInput
  * @returns {CartDeliveryOptionsDiscountsGenerateRunResult} - The function result with discounts.
  */
-export function generateDeliveryRun(input) {
+export function cartDeliveryOptionsDiscountsGenerateRun(input) {
   const firstDeliveryGroup = input.cart.deliveryGroups[0];
   if (!firstDeliveryGroup) {
       throw new Error('No delivery groups found');
@@ -51,7 +51,7 @@ import {
   CartDeliveryOptionsDiscountsGenerateRunResult,
 } from '../generated/api';
 
-export function generateDeliveryRun(
+export function cartDeliveryOptionsDiscountsGenerateRun(
   input: DeliveryInput,
 ): CartDeliveryOptionsDiscountsGenerateRunResult {
   const firstDeliveryGroup = input.cart.deliveryGroups[0];
diff --git a/discounts/javascript/discount/default/src/generate_delivery_run.test.liquid b/discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.test.liquid
similarity index 83%
rename from discounts/javascript/discount/default/src/generate_delivery_run.test.liquid
rename to discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.test.liquid
index a6ec200f..7dbba381 100644
--- a/discounts/javascript/discount/default/src/generate_delivery_run.test.liquid
+++ b/discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.test.liquid
@@ -1,7 +1,7 @@
 {%- if flavor contains "vanilla-js" -%}
 import { describe, it, expect } from "vitest";
 
-import { generateDeliveryRun } from "./generate_delivery_run";
+import { cartDeliveryOptionsDiscountsGenerateRun } from "./cart_delivery_options_discounts_generate_run";
 import {
   DeliveryDiscountSelectionStrategy,
 } from "../generated/api";
@@ -11,7 +11,7 @@ import {
  * @typedef {import("../generated/api").DeliveryInput} DeliveryInput
  */
 
-describe("generateDeliveryRun", () => {
+describe("cartDeliveryOptionsDiscountsGenerateRun", () => {
   it("returns a delivery discount", () => {
     const input = /** @type {DeliveryInput} */ ({
       cart: {
@@ -23,7 +23,7 @@ describe("generateDeliveryRun", () => {
       },
     });
 
-    const result = generateDeliveryRun(input);
+    const result = cartDeliveryOptionsDiscountsGenerateRun(input);
 
     expect(result.operations.length).toBe(1);
     expect(result.operations[0]).toMatchObject({
@@ -53,14 +53,14 @@ describe("generateDeliveryRun", () => {
 {%- elsif flavor contains "typescript" -%}
 import { describe, it, expect } from "vitest";
 
-import { generateDeliveryRun } from "./generate_delivery_run";
+import { cartDeliveryOptionsDiscountsGenerateRun } from "./cart_delivery_options_discounts_generate_run";
 import {
   DeliveryDiscountSelectionStrategy,
   DeliveryInput,
   CartDeliveryOptionsDiscountsGenerateRunResult
 } from "../generated/api";
 
-describe("generateDeliveryRun", () => {
+describe("cartDeliveryOptionsDiscountsGenerateRun", () => {
   it("returns a delivery discount", () => {
     const input: DeliveryInput = {
       cart: {
@@ -72,7 +72,7 @@ describe("generateDeliveryRun", () => {
       },
     };
 
-    const result: CartDeliveryOptionsDiscountsGenerateRunResult = generateDeliveryRun(input);
+    const result: CartDeliveryOptionsDiscountsGenerateRunResult = cartDeliveryOptionsDiscountsGenerateRun(input);
 
     expect(result.operations.length).toBe(1);
     expect(result.operations[0]).toMatchObject({
@@ -99,4 +99,4 @@ describe("generateDeliveryRun", () => {
     });
   });
 });
-{%- endif -%} 
\ No newline at end of file
+{%- endif -%} 
diff --git a/discounts/javascript/discount/default/src/generate_cart_run.graphql.liquid b/discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.graphql.liquid
similarity index 100%
rename from discounts/javascript/discount/default/src/generate_cart_run.graphql.liquid
rename to discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.graphql.liquid
diff --git a/discounts/javascript/discount/default/src/generate_cart_run.liquid b/discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.liquid
similarity index 95%
rename from discounts/javascript/discount/default/src/generate_cart_run.liquid
rename to discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.liquid
index 252d2498..7e0263a5 100644
--- a/discounts/javascript/discount/default/src/generate_cart_run.liquid
+++ b/discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.liquid
@@ -12,11 +12,11 @@ import {
  */
 
 /**
- * generateCartRun
+ * cartLinesDiscountsGenerateRun
  * @param {CartInput} input - The CartInput
  * @returns {CartLinesDiscountsGenerateRunResult} - The function result with discounts.
  */
-export function generateCartRun(input) {
+export function cartLinesDiscountsGenerateRun(input) {
     if (!input.cart.lines.length) {
         throw new Error('No cart lines found');
     }
@@ -83,7 +83,7 @@ import {
   CartLinesDiscountsGenerateRunResult,
 } from '../generated/api';
 
-export function generateCartRun(input: CartInput): CartLinesDiscountsGenerateRunResult {
+export function cartLinesDiscountsGenerateRun(input: CartInput): CartLinesDiscountsGenerateRunResult {
   if (!input.cart.lines.length) {
     throw new Error('No cart lines found');
   }
diff --git a/discounts/javascript/discount/default/src/generate_cart_run.test.liquid b/discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.test.liquid
similarity index 88%
rename from discounts/javascript/discount/default/src/generate_cart_run.test.liquid
rename to discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.test.liquid
index cb8cf6ec..4eba9efe 100644
--- a/discounts/javascript/discount/default/src/generate_cart_run.test.liquid
+++ b/discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.test.liquid
@@ -1,7 +1,7 @@
 {%- if flavor contains "vanilla-js" -%}
 import { describe, it, expect } from "vitest";
 
-import { generateCartRun } from "./generate_cart_run";
+import { cartLinesDiscountsGenerateRun } from "./cart_lines_discounts_generate_run";
 import {
   OrderDiscountSelectionStrategy,
   ProductDiscountSelectionStrategy,
@@ -11,7 +11,7 @@ import {
  * @typedef {import("../generated/api").CartLinesDiscountsGenerateRunResult} CartLinesDiscountsGenerateRunResult
  */
 
-describe("generateCartRun", () => {
+describe("cartLinesDiscountsGenerateRun", () => {
   it("returns a product and order discount", () => {
     const input = {
       cart: {
@@ -26,7 +26,7 @@ describe("generateCartRun", () => {
       },
     };
 
-    const result = generateCartRun(input);
+    const result = cartLinesDiscountsGenerateRun(input);
 
     expect(result.operations.length).toBe(2);
     expect(result.operations[0]).toMatchObject({
@@ -79,7 +79,7 @@ describe("generateCartRun", () => {
 {%- elsif flavor contains "typescript" -%}
 import { describe, it, expect } from "vitest";
 
-import { generateCartRun } from "./generate_cart_run";
+import { cartLinesDiscountsGenerateRun } from "./cart_lines_discounts_generate_run";
 import {
   OrderDiscountSelectionStrategy,
   ProductDiscountSelectionStrategy,
@@ -87,7 +87,7 @@ import {
   CartLinesDiscountsGenerateRunResult
 } from "../generated/api";
 
-describe("generateCartRun", () => {
+describe("cartLinesDiscountsGenerateRun", () => {
   it("returns a product and order discount", () => {
     const input: CartInput = {
       cart: {
@@ -102,7 +102,7 @@ describe("generateCartRun", () => {
       },
     };
 
-    const result: CartLinesDiscountsGenerateRunResult = generateCartRun(input);
+    const result: CartLinesDiscountsGenerateRunResult = cartLinesDiscountsGenerateRun(input);
 
     expect(result.operations.length).toBe(2);
     expect(result.operations[0]).toMatchObject({
@@ -152,4 +152,4 @@ describe("generateCartRun", () => {
     });
   });
 });
-{%- endif -%} 
\ No newline at end of file
+{%- endif -%} 
diff --git a/discounts/javascript/discount/default/src/index.liquid b/discounts/javascript/discount/default/src/index.liquid
index 84ba5c03..c2652e2c 100644
--- a/discounts/javascript/discount/default/src/index.liquid
+++ b/discounts/javascript/discount/default/src/index.liquid
@@ -1,2 +1,2 @@
-export * from './generate_cart_run';
-export * from './generate_delivery_run';
+export * from './cart_lines_discounts_generate_run';
+export * from './cart_delivery_options_discounts_generate_run';
diff --git a/discounts/rust/discount/default/shopify.extension.toml.liquid b/discounts/rust/discount/default/shopify.extension.toml.liquid
index 216c2bc1..80446a90 100644
--- a/discounts/rust/discount/default/shopify.extension.toml.liquid
+++ b/discounts/rust/discount/default/shopify.extension.toml.liquid
@@ -9,13 +9,13 @@ description = "t:description"
 
   [[extensions.targeting]]
   target = "cart.lines.discounts.generate.run"
-  input_query = "src/generate_cart_run.graphql"
-  export = "generate_cart_run"
+  input_query = "src/cart_lines_discounts_generate_run.graphql"
+  export = "cart_lines_discounts_generate_run"
 
   [[extensions.targeting]]
   target = "cart.delivery-options.discounts.generate.run"
-  input_query = "src/generate_delivery_run.graphql"
-  export = "generate_delivery_run"
+  input_query = "src/cart_delivery_options_discounts_generate_run.graphql"
+  export = "cart_delivery_options_discounts_generate_run"
 
   [extensions.build]
   command = "cargo build --target=wasm32-wasip1 --release"
diff --git a/discounts/rust/discount/default/src/generate_delivery_run.graphql.liquid b/discounts/rust/discount/default/src/cart_delivery_options_discounts_generate_run.graphql.liquid
similarity index 100%
rename from discounts/rust/discount/default/src/generate_delivery_run.graphql.liquid
rename to discounts/rust/discount/default/src/cart_delivery_options_discounts_generate_run.graphql.liquid
diff --git a/discounts/rust/discount/default/src/generate_delivery_run.rs b/discounts/rust/discount/default/src/cart_delivery_options_discounts_generate_run.rs
similarity index 92%
rename from discounts/rust/discount/default/src/generate_delivery_run.rs
rename to discounts/rust/discount/default/src/cart_delivery_options_discounts_generate_run.rs
index b2792691..b621314c 100644
--- a/discounts/rust/discount/default/src/generate_delivery_run.rs
+++ b/discounts/rust/discount/default/src/cart_delivery_options_discounts_generate_run.rs
@@ -11,11 +11,10 @@ use cart_delivery_options_discounts_generate_run::output::{
 use cart_delivery_options_discounts_generate_run::input::ResponseData;
 
 #[shopify_function_target(
-    target = "cartDeliveryOptionsDiscountsGenerateRun",
-    query_path = "src/generate_delivery_run.graphql",
+    query_path = "src/cart_delivery_options_discounts_generate_run.graphql",
     schema_path = "schema.graphql"
 )]
-fn generate_delivery_run(
+fn cart_delivery_options_discounts_generate_run(
     input: ResponseData,
 ) -> Result<CartDeliveryOptionsDiscountsGenerateRunResult> {
     let first_delivery_group = input
diff --git a/discounts/rust/discount/default/src/generate_cart_run.graphql.liquid b/discounts/rust/discount/default/src/cart_lines_discounts_generate_run.graphql.liquid
similarity index 100%
rename from discounts/rust/discount/default/src/generate_cart_run.graphql.liquid
rename to discounts/rust/discount/default/src/cart_lines_discounts_generate_run.graphql.liquid
diff --git a/discounts/rust/discount/default/src/generate_cart_run.rs b/discounts/rust/discount/default/src/cart_lines_discounts_generate_run.rs
similarity index 93%
rename from discounts/rust/discount/default/src/generate_cart_run.rs
rename to discounts/rust/discount/default/src/cart_lines_discounts_generate_run.rs
index 90557c36..25edd88a 100644
--- a/discounts/rust/discount/default/src/generate_cart_run.rs
+++ b/discounts/rust/discount/default/src/cart_lines_discounts_generate_run.rs
@@ -12,11 +12,12 @@ use cart_lines_discounts_generate_run::output::{
 use cart_lines_discounts_generate_run::input::ResponseData;
 
 #[shopify_function_target(
-    target = "cartLinesDiscountsGenerateRun",
-    query_path = "src/generate_cart_run.graphql",
+    query_path = "src/cart_lines_discounts_generate_run.graphql",
     schema_path = "schema.graphql"
 )]
-fn generate_cart_run(input: ResponseData) -> Result<CartLinesDiscountsGenerateRunResult> {
+fn cart_lines_discounts_generate_run(
+    input: ResponseData,
+) -> Result<CartLinesDiscountsGenerateRunResult> {
     let max_cart_line = input
         .cart
         .lines
diff --git a/discounts/rust/discount/default/src/main.rs b/discounts/rust/discount/default/src/main.rs
index 966e529d..7a2d9006 100644
--- a/discounts/rust/discount/default/src/main.rs
+++ b/discounts/rust/discount/default/src/main.rs
@@ -1,6 +1,6 @@
 use std::process;
-pub mod generate_cart_run;
-pub mod generate_delivery_run;
+pub mod cart_delivery_options_discounts_generate_run;
+pub mod cart_lines_discounts_generate_run;
 
 fn main() {
     eprintln!("Please invoke a named export.");