diff --git a/pyaerocom/aeroval/experiment_output.py b/pyaerocom/aeroval/experiment_output.py
index 28b6db646..1156edae0 100644
--- a/pyaerocom/aeroval/experiment_output.py
+++ b/pyaerocom/aeroval/experiment_output.py
@@ -343,12 +343,7 @@ def _info_from_contour_dir_file(file: pathlib.PosixPath):
         spl = os.path.basename(file.name).split(suffix)[0].split("_")
 
         if len(spl) == 3:
-            if suffix == ".png" or suffix == ".webp":
-                name = spl[0]
-                var_name = spl[1]
-                per = spl[2]
-                return (name, var_name, per)
-            elif suffix == ".geojson":
+            if suffix == ".geojson" or suffix == ".png" or suffix == ".webp":
                 name = spl[1]
                 var_name = spl[0]
                 per = spl[2]
diff --git a/tests/aeroval/test_experiment_output.py b/tests/aeroval/test_experiment_output.py
index d38aa3113..9f1ac079f 100644
--- a/tests/aeroval/test_experiment_output.py
+++ b/tests/aeroval/test_experiment_output.py
@@ -174,15 +174,15 @@ def test_ExperimentOutput__info_from_map_file_error(filename: str):
 
 
 def test_ExperimentOutput__info_from_contour_dir_file_webp():
-    file = pathlib.PosixPath("path/to/name_vertical_period.webp")
+    file = pathlib.PosixPath("path/to/var_name_period.webp")
     output = ExperimentOutput._info_from_contour_dir_file(file)
-    assert output == ("name", "vertical", "period")
+    assert output == ("name", "var", "period")
 
 
 def test_ExperimentOutput__info_from_contour_dir_file_geojson():
-    file = pathlib.PosixPath("path/to/var_model_period.geojson")
+    file = pathlib.PosixPath("path/to/var_name_period.geojson")
     output = ExperimentOutput._info_from_contour_dir_file(file)
-    assert output == ("model", "var", "period")
+    assert output == ("name", "var", "period")
 
 
 def test_ExperimentOutput__info_from_contour_dir_file_error():