diff --git a/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-MUL-B-1-1-1100761-150924T044238-ID.json b/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-MUL-B-1-1-1100761-150924T044238-ID.json
index 753156c0..95ea71b4 100644
--- a/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-MUL-B-1-1-1100761-150924T044238-ID.json
+++ b/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-MUL-B-1-1-1100761-150924T044238-ID.json
@@ -40,9 +40,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:01.0000000Z",
     "created": "2021-06-11T15:35:42.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -56,7 +56,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1B",
-    "title": "BKA/KANOPUS-V MSS L1B 2015-09-24 04:43:01",
+    "title": "BKA MSS L1B 2015-09-24 04:43:01",
     "providers": [
       {
         "name": "NAS",
diff --git a/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-PAN-B-1-1-1100761-150924T044238-ID.json b/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-PAN-B-1-1-1100761-150924T044238-ID.json
index 768a1a4c..3cd71c32 100644
--- a/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-PAN-B-1-1-1100761-150924T044238-ID.json
+++ b/src/Stars.Data.Tests/Resources/BKA/L1B/MetadataExtractorsTests_4077631-0220-PAN-B-1-1-1100761-150924T044238-ID.json
@@ -38,9 +38,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:02.0000000Z",
     "created": "2021-06-11T15:35:50.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -54,7 +54,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1B",
-    "title": "BKA/KANOPUS-V MSS L1B 2015-09-24 04:43:02",
+    "title": "BKA MSS L1B 2015-09-24 04:43:02",
     "providers": [
       {
         "name": "NAS",
diff --git a/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-MUL-C-1-1-1100761-150924T044238-ID.json b/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-MUL-C-1-1-1100761-150924T044238-ID.json
index 38c2727b..df12b007 100644
--- a/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-MUL-C-1-1-1100761-150924T044238-ID.json
+++ b/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-MUL-C-1-1-1100761-150924T044238-ID.json
@@ -40,9 +40,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:01.0000000Z",
     "created": "2021-06-11T16:38:46.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -56,7 +56,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1C",
-    "title": "BKA/KANOPUS-V MSS L1C 2015-09-24 04:43:01",
+    "title": "BKA MSS L1C 2015-09-24 04:43:01",
     "providers": [
       {
         "name": "NAS",
diff --git a/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-PAN-C-1-1-1100761-150924T044238-ID.json b/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-PAN-C-1-1-1100761-150924T044238-ID.json
index 535ee5a8..222e68b5 100644
--- a/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-PAN-C-1-1-1100761-150924T044238-ID.json
+++ b/src/Stars.Data.Tests/Resources/BKA/L1C/MetadataExtractorsTests_4077631-0220-PAN-C-1-1-1100761-150924T044238-ID.json
@@ -38,9 +38,9 @@
   "properties": {
     "datetime": "2015-09-24T04:43:02.0000000Z",
     "created": "2021-06-11T16:38:54.0000000Z",
-    "platform": "bka/kanopus-v",
+    "platform": "bka",
     "constellation": "bka",
-    "mission": "bka",
+    "mission": "bka/kanopus-v",
     "instruments": [
       "mss"
     ],
@@ -54,7 +54,7 @@
     ],
     "view:azimuth": 84.08,
     "processing:level": "L1C",
-    "title": "BKA/KANOPUS-V MSS L1C 2015-09-24 04:43:02",
+    "title": "BKA MSS L1C 2015-09-24 04:43:02",
     "providers": [
       {
         "name": "NAS",
diff --git a/src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs b/src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs
index 3ad7fed7..cd3dcffe 100644
--- a/src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs
+++ b/src/Stars.Data/Model/Metadata/Bka/BkaMetadataExtractor.cs
@@ -203,9 +203,9 @@ private void FillPlatformDefinition(BkaMetadata metadata, Dictionary<string, obj
             string platform = "bka";
             if (metadata.Processing?.Satellite != null) platform = metadata.Processing.Satellite.ToLower();
             string mission = "bka";
-            if (metadata.Processing?.Mission != null) platform = metadata.Processing.Mission.ToLower();
+            if (metadata.Processing?.Mission != null) mission = metadata.Processing.Mission.ToLower();
             properties["platform"] = platform;
-            properties["constellation"] = mission;
+            properties["constellation"] = platform;
             properties["mission"] = mission;
             properties["instruments"] = new string[] { GetInstrument(metadata).ToLower() };
             properties["sensor_type"] = "optical";