diff --git a/othello/ui/aggregate.py b/othello/ui/aggregate.py
index 158c377..ca673e9 100644
--- a/othello/ui/aggregate.py
+++ b/othello/ui/aggregate.py
@@ -66,6 +66,9 @@ def aggregate(self):
             df = self.add_weighted_columns(df)
             gis.io.write(df, filepath[0])
 
+            popup = Popup("Done", self)
+            popup.show()
+
         except errors.LessThenTwoCriteriaError:
             popup = Popup("At least 2 criteria must be loaded", self)
             popup.show()
@@ -117,6 +120,9 @@ def add_weighted_columns(self, df: geopandas.GeoDataFrame) -> geopandas.GeoDataF
             criterion = self.table.item(row_index, 2).text()
             weight = float(self.table.item(row_index, 3).text())
 
+            # Removing the _mb suffix
+            criterion = criterion.replace('_mb', '')
+
             criterion_geoseries = gis.io.read(filepath, layer=layer)[criterion]
             df[criterion + '_np'] = criterion_geoseries
             df[criterion + '_p'] = weight * criterion_geoseries
diff --git a/othello/ui/criteria.py b/othello/ui/criteria.py
index 08c1392..b4df859 100644
--- a/othello/ui/criteria.py
+++ b/othello/ui/criteria.py
@@ -136,12 +136,12 @@ def write_file(self):
             return
 
         try:
-            self.df['macbeth'] = evaluate_new_values(
+            self.df[self.combobox_field.currentText() + '_mb'] = evaluate_new_values(
                 series=self.df[self.combobox_field.currentText()],
                 criterion_parameters=self.criterion_parameters
             )
 
-            gis.io.write(self.df, self.geo_filepath, layer=self.layer + '_mb')
+            gis.io.write(self.df, self.geo_filepath, layer=self.layer)
 
             popup = Popup("Done", self)
             popup.show()
diff --git a/tests/data/CritereArretsSTS.gdb/a00000001.TablesByName.atx b/tests/data/CritereArretsSTS.gdb/a00000001.TablesByName.atx
index a7d8bb2..1a007f9 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000001.TablesByName.atx and b/tests/data/CritereArretsSTS.gdb/a00000001.TablesByName.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000001.freelist b/tests/data/CritereArretsSTS.gdb/a00000001.freelist
index 5a12e0a..9c361a6 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000001.freelist and b/tests/data/CritereArretsSTS.gdb/a00000001.freelist differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000001.gdbtable b/tests/data/CritereArretsSTS.gdb/a00000001.gdbtable
index 2fda8fd..8d0b27b 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000001.gdbtable and b/tests/data/CritereArretsSTS.gdb/a00000001.gdbtable differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000001.gdbtablx b/tests/data/CritereArretsSTS.gdb/a00000001.gdbtablx
index f17c0e1..68a6905 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000001.gdbtablx and b/tests/data/CritereArretsSTS.gdb/a00000001.gdbtablx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByPhysicalName.atx b/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByPhysicalName.atx
index 01c31e2..afce882 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByPhysicalName.atx and b/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByPhysicalName.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByType.atx b/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByType.atx
index 4cc10a1..47661f9 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByType.atx and b/tests/data/CritereArretsSTS.gdb/a00000004.CatItemsByType.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.FDO_UUID.atx b/tests/data/CritereArretsSTS.gdb/a00000004.FDO_UUID.atx
index 37fdbe8..47f5a1a 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.FDO_UUID.atx and b/tests/data/CritereArretsSTS.gdb/a00000004.FDO_UUID.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.freelist b/tests/data/CritereArretsSTS.gdb/a00000004.freelist
index f543c35..d146990 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.freelist and b/tests/data/CritereArretsSTS.gdb/a00000004.freelist differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.gdbtable b/tests/data/CritereArretsSTS.gdb/a00000004.gdbtable
index ac04eef..52cc1c4 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.gdbtable and b/tests/data/CritereArretsSTS.gdb/a00000004.gdbtable differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.gdbtablx b/tests/data/CritereArretsSTS.gdb/a00000004.gdbtablx
index e72ff04..42a8a0b 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.gdbtablx and b/tests/data/CritereArretsSTS.gdb/a00000004.gdbtablx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000004.spx b/tests/data/CritereArretsSTS.gdb/a00000004.spx
index 0a78d16..38259c8 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000004.spx and b/tests/data/CritereArretsSTS.gdb/a00000004.spx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByDestinationID.atx b/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByDestinationID.atx
index 9b81306..b9f1cb7 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByDestinationID.atx and b/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByDestinationID.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByOriginID.atx b/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByOriginID.atx
index 68a7958..7d6aa0f 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByOriginID.atx and b/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByOriginID.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByType.atx b/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByType.atx
index af43f48..a8d28b1 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByType.atx and b/tests/data/CritereArretsSTS.gdb/a00000006.CatRelsByType.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.FDO_UUID.atx b/tests/data/CritereArretsSTS.gdb/a00000006.FDO_UUID.atx
index 4cdf01f..3ef3ac2 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.FDO_UUID.atx and b/tests/data/CritereArretsSTS.gdb/a00000006.FDO_UUID.atx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.freelist b/tests/data/CritereArretsSTS.gdb/a00000006.freelist
index 3d86fe9..69d2307 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.freelist and b/tests/data/CritereArretsSTS.gdb/a00000006.freelist differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.gdbtable b/tests/data/CritereArretsSTS.gdb/a00000006.gdbtable
index 9ac63f9..41e8e6c 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.gdbtable and b/tests/data/CritereArretsSTS.gdb/a00000006.gdbtable differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000006.gdbtablx b/tests/data/CritereArretsSTS.gdb/a00000006.gdbtablx
index 6c90690..b10bc7f 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000006.gdbtablx and b/tests/data/CritereArretsSTS.gdb/a00000006.gdbtablx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000e.freelist b/tests/data/CritereArretsSTS.gdb/a0000000e.freelist
deleted file mode 100644
index 7b791b3..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a0000000e.freelist and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000e.gdbtable b/tests/data/CritereArretsSTS.gdb/a0000000e.gdbtable
deleted file mode 100644
index 16e5c37..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a0000000e.gdbtable and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000e.gdbtablx b/tests/data/CritereArretsSTS.gdb/a0000000e.gdbtablx
deleted file mode 100644
index 72ef468..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a0000000e.gdbtablx and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000f.freelist b/tests/data/CritereArretsSTS.gdb/a0000000f.freelist
new file mode 100644
index 0000000..731539a
Binary files /dev/null and b/tests/data/CritereArretsSTS.gdb/a0000000f.freelist differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000e.gdbindexes b/tests/data/CritereArretsSTS.gdb/a0000000f.gdbindexes
similarity index 100%
rename from tests/data/CritereArretsSTS.gdb/a0000000e.gdbindexes
rename to tests/data/CritereArretsSTS.gdb/a0000000f.gdbindexes
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000f.gdbtable b/tests/data/CritereArretsSTS.gdb/a0000000f.gdbtable
new file mode 100644
index 0000000..90b4176
Binary files /dev/null and b/tests/data/CritereArretsSTS.gdb/a0000000f.gdbtable differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000f.gdbtablx b/tests/data/CritereArretsSTS.gdb/a0000000f.gdbtablx
new file mode 100644
index 0000000..88d9db5
Binary files /dev/null and b/tests/data/CritereArretsSTS.gdb/a0000000f.gdbtablx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a0000000e.spx b/tests/data/CritereArretsSTS.gdb/a0000000f.spx
similarity index 100%
rename from tests/data/CritereArretsSTS.gdb/a0000000e.spx
rename to tests/data/CritereArretsSTS.gdb/a0000000f.spx
diff --git a/tests/data/CritereArretsSTS.gdb/a00000011.gdbtable b/tests/data/CritereArretsSTS.gdb/a00000011.gdbtable
index 646b5f4..fd1096d 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000011.gdbtable and b/tests/data/CritereArretsSTS.gdb/a00000011.gdbtable differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000011.gdbtablx b/tests/data/CritereArretsSTS.gdb/a00000011.gdbtablx
index 3304771..b6fbdd2 100644
Binary files a/tests/data/CritereArretsSTS.gdb/a00000011.gdbtablx and b/tests/data/CritereArretsSTS.gdb/a00000011.gdbtablx differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000012.gdbindexes b/tests/data/CritereArretsSTS.gdb/a00000012.gdbindexes
deleted file mode 100644
index cc24e2a..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a00000012.gdbindexes and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000012.gdbtable b/tests/data/CritereArretsSTS.gdb/a00000012.gdbtable
deleted file mode 100644
index 64949fc..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a00000012.gdbtable and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000012.gdbtablx b/tests/data/CritereArretsSTS.gdb/a00000012.gdbtablx
deleted file mode 100644
index 3304771..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a00000012.gdbtablx and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/a00000012.spx b/tests/data/CritereArretsSTS.gdb/a00000012.spx
deleted file mode 100644
index ce477f3..0000000
Binary files a/tests/data/CritereArretsSTS.gdb/a00000012.spx and /dev/null differ
diff --git a/tests/data/CritereArretsSTS.gdb/timestamps b/tests/data/CritereArretsSTS.gdb/timestamps
index 0a41b14..f426e2a 100644
Binary files a/tests/data/CritereArretsSTS.gdb/timestamps and b/tests/data/CritereArretsSTS.gdb/timestamps differ