diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuilderBootstrapController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuilderBootstrapController.java
index 5c87f06..a81ca6e 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuilderBootstrapController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuilderBootstrapController.java
@@ -34,7 +34,7 @@ public class BuilderBootstrapController {
      */
     @GetMapping("/bootstrap")
     public BuilderBootstrapDto bootstrap(
-            @RequestParam(defaultValue = "AR-15") String platform
+            @RequestParam(defaultValue = "AR15") String platform
     ) {
         final String platformNorm = normalizePlatform(platform);
 
@@ -86,11 +86,11 @@ public class BuilderBootstrapController {
     }
 
     private String normalizePlatform(String platform) {
-        if (platform == null) return "AR-15";
+        if (platform == null) return "AR15";
         String p = platform.trim();
-        if (p.isEmpty()) return "AR-15";
-        // normalize to AR-15 / AR-10 style
-        return p.toUpperCase(Locale.ROOT).replace('_', '-');
+        if (p.isEmpty()) return "AR15";
+        // normalize to AR15 / AR10 style (uppercase, no hyphens)
+        return p.toUpperCase(Locale.ROOT).replace("-", "").replace("_", "");
     }
 
     public record BuilderBootstrapDto(
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductController.java
index 34cd122..135b554 100644
--- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductController.java
+++ b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductController.java
@@ -37,7 +37,7 @@ public class ProductController {
             key = "#platform + '::' + (#partRoles == null ? 'ALL' : #partRoles) + '::' + #priceSort + '::' + #pageable.pageNumber + '::' + #pageable.pageSize"
     )
     public Page<ProductSummaryDto> getProducts(
-            @RequestParam(defaultValue = "AR-15") String platform,
+            @RequestParam(defaultValue = "AR15") String platform,
             @RequestParam(required = false, name = "partRoles") List<String> partRoles,
             @RequestParam(name = "priceSort", defaultValue = "price_asc") String priceSort,
             @PageableDefault(size = 50) Pageable pageable
diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java
index eeb25f5..6332463 100644
--- a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java
+++ b/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java
@@ -254,7 +254,7 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService
 
             String finalPlatform = resolvedPlatform != null
                     ? resolvedPlatform
-                    : (basePlatform != null ? basePlatform : "AR-15");
+                    : (basePlatform != null ? basePlatform : "AR15");
 
             p.setPlatform(finalPlatform);
         }
@@ -669,12 +669,12 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService
                 coalesce(trimOrNull(row.subCategory()), "")
         ).toLowerCase(Locale.ROOT);
 
-        if (blob.contains("ar-15") || blob.contains("ar15")) return "AR-15";
-        if (blob.contains("ar-10") || blob.contains("ar10") || blob.contains("lr-308") || blob.contains("lr308")) return "AR-10";
-        if (blob.contains("ar-9")  || blob.contains("ar9"))  return "AR-9";
-        if (blob.contains("ak-47") || blob.contains("ak47") || blob.contains("ak ")) return "AK-47";
+        if (blob.contains("ar-15") || blob.contains("ar15")) return "AR15";
+        if (blob.contains("ar-10") || blob.contains("ar10") || blob.contains("lr-308") || blob.contains("lr308")) return "AR10";
+        if (blob.contains("ar-9")  || blob.contains("ar9"))  return "AR9";
+        if (blob.contains("ak-47") || blob.contains("ak47") || blob.contains("ak ")) return "AK47";
 
-        return "AR-15"; // safe default
+        return "AR15"; // safe default
     }
 
     public MerchantFeedImportServiceImpl(