diff --git a/msm_common.bzl b/msm_common.bzl
index 8589da1033de..efe76c60533b 100644
--- a/msm_common.bzl
+++ b/msm_common.bzl
@@ -35,8 +35,7 @@ def gen_config_without_source_lines(build_config, target):
 
 def get_out_dir(msm_target, variant):
     if msm_target.find("allyes") != -1:
-        le_target = msm_target.split(".")[0];
-        return "out/msm-kernel-{}-{}".format(le_target.replace("-", "_"), variant.replace("-", "_"))
+        return "out/msm-kernel-{}-{}".format(msm_target.replace("_", "-"), variant.replace("-", "_"))
     return "out/msm-kernel-{}-{}".format(msm_target.replace("-", "_"), variant.replace("-", "_"))
 
 def define_signing_keys():
diff --git a/msm_kernel_le.bzl b/msm_kernel_le.bzl
index 2a11b38e1e1f..2aaf113b1267 100644
--- a/msm_kernel_le.bzl
+++ b/msm_kernel_le.bzl
@@ -171,6 +171,7 @@ def _define_kernel_dist(target, msm_target, variant):
     """
 
     dist_dir = get_out_dir(msm_target, variant) + "/dist"
+    le_target = msm_target.split("-")[0];
 
     msm_dist_targets = [
         # do not sort
@@ -178,7 +179,7 @@ def _define_kernel_dist(target, msm_target, variant):
         ":{}_images".format(target),
         ":{}_merged_kernel_uapi_headers".format(target),
         ":{}_build_config".format(target),
-        ":{}_dummy_files".format(msm_target),
+        ":{}_dummy_files".format(le_target),
     ]
 
     copy_to_dist_dir(
@@ -235,7 +236,7 @@ def define_msm_le(
     # Enforce format of "//msm-kernel:target-foo_variant-bar" (underscore is the delimeter
     # between target and variant)
     target = msm_target.replace("_", "-") + "_" + variant.replace("_", "-")
-    le_target = msm_target.split(".")[0];
+    le_target = msm_target.split("-")[0];
 
     dtb_list = get_dtb_list(le_target)
     dtbo_list = get_dtbo_list(le_target)
@@ -272,10 +273,10 @@ def define_msm_le(
         boot_image_outs = ["boot.img"],
     )
 
-    _define_kernel_dist(target, le_target, variant)
+    _define_kernel_dist(target, msm_target, variant)
 
-    define_abl_dist(target, le_target, variant)
+    define_abl_dist(target, msm_target, variant)
 
-    define_dtc_dist(target, le_target, variant)
+    define_dtc_dist(target, msm_target, variant)
 
     define_extras(target, flavor = "allyes")
diff --git a/pineapple_allyes.bzl b/pineapple_allyes.bzl
index bb5ec4fbc92d..e2749ea36909 100644
--- a/pineapple_allyes.bzl
+++ b/pineapple_allyes.bzl
@@ -2,7 +2,7 @@ load(":target_variants.bzl", "le_variants")
 load(":msm_kernel_le.bzl", "define_msm_le")
 load(":image_opts.bzl", "boot_image_opts")
 
-target_name = "pineapple.allyes"
+target_name = "pineapple-allyes"
 
 def define_pineapple_allyes():
     _pineapple_le_in_tree_modules = [
diff --git a/target_variants.bzl b/target_variants.bzl
index dc7003c13e75..918fdbf21d35 100644
--- a/target_variants.bzl
+++ b/target_variants.bzl
@@ -12,7 +12,7 @@ la_variants = [
 
 le_targets = [
     # keep sorted
-    "pineapple.allyes",
+    "pineapple-allyes",
 ]
 
 le_variants = [