diff --git a/src/tests/elementary/efl_ui_test_item_container.c b/src/tests/elementary/efl_ui_test_collection.c
similarity index 96%
rename from src/tests/elementary/efl_ui_test_item_container.c
rename to src/tests/elementary/efl_ui_test_collection.c
index 349f73fee0..c645fba210 100644
--- a/src/tests/elementary/efl_ui_test_item_container.c
+++ b/src/tests/elementary/efl_ui_test_collection.c
@@ -4,7 +4,7 @@
 
 #include <Efl_Ui.h>
 #include "efl_ui_suite.h"
-#include "efl_ui_test_item_container_common.h"
+#include "efl_ui_test_collection_common.h"
 
 static Eo* win;
 
diff --git a/src/tests/elementary/efl_ui_test_item_container_common.c b/src/tests/elementary/efl_ui_test_collection_common.c
similarity index 99%
rename from src/tests/elementary/efl_ui_test_item_container_common.c
rename to src/tests/elementary/efl_ui_test_collection_common.c
index 3a7cad3678..c41946afbe 100644
--- a/src/tests/elementary/efl_ui_test_item_container_common.c
+++ b/src/tests/elementary/efl_ui_test_collection_common.c
@@ -4,7 +4,7 @@
 
 #include <Efl_Ui.h>
 #include "efl_ui_suite.h"
-#include "efl_ui_test_item_container_common.h"
+#include "efl_ui_test_collection_common.h"
 
 Eo *item_container;
 
diff --git a/src/tests/elementary/efl_ui_test_item_container_common.h b/src/tests/elementary/efl_ui_test_collection_common.h
similarity index 100%
rename from src/tests/elementary/efl_ui_test_item_container_common.h
rename to src/tests/elementary/efl_ui_test_collection_common.h
diff --git a/src/tests/elementary/efl_ui_test_grid_container.c b/src/tests/elementary/efl_ui_test_grid_collection.c
similarity index 94%
rename from src/tests/elementary/efl_ui_test_grid_container.c
rename to src/tests/elementary/efl_ui_test_grid_collection.c
index a8e94b05b4..d0dad63c7d 100644
--- a/src/tests/elementary/efl_ui_test_grid_container.c
+++ b/src/tests/elementary/efl_ui_test_grid_collection.c
@@ -4,7 +4,7 @@
 
 #include <Efl_Ui.h>
 #include "efl_ui_suite.h"
-#include "efl_ui_test_item_container_common.h"
+#include "efl_ui_test_collection_common.h"
 
 static Eo *win;
 
diff --git a/src/tests/elementary/efl_ui_test_list_container.c b/src/tests/elementary/efl_ui_test_list_collection.c
similarity index 94%
rename from src/tests/elementary/efl_ui_test_list_container.c
rename to src/tests/elementary/efl_ui_test_list_collection.c
index 6edad08126..98af17e7ec 100644
--- a/src/tests/elementary/efl_ui_test_list_container.c
+++ b/src/tests/elementary/efl_ui_test_list_collection.c
@@ -4,7 +4,7 @@
 
 #include <Efl_Ui.h>
 #include "efl_ui_suite.h"
-#include "efl_ui_test_item_container_common.h"
+#include "efl_ui_test_collection_common.h"
 
 static Eo *win;
 
diff --git a/src/tests/elementary/efl_ui_test_position_manager_common.c b/src/tests/elementary/efl_ui_test_position_manager_common.c
index e465bd3482..7cf39f92d8 100644
--- a/src/tests/elementary/efl_ui_test_position_manager_common.c
+++ b/src/tests/elementary/efl_ui_test_position_manager_common.c
@@ -4,7 +4,7 @@
 
 #include <Efl_Ui.h>
 #include "efl_ui_suite.h"
-#include "efl_ui_test_item_container_common.h"
+#include "efl_ui_test_collection_common.h"
 
 Eo *position_manager;
 
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 7623a5cc52..3bd7d2f85a 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -146,10 +146,10 @@ efl_ui_suite_src = [
   'efl_ui_test_spin.c',
   'efl_ui_test_spin_button.c',
   'efl_ui_test_slider.c',
-  'efl_ui_test_item_container_common.c',
-  'efl_ui_test_item_container.c',
-  'efl_ui_test_list_container.c',
-  'efl_ui_test_grid_container.c',
+  'efl_ui_test_collection_common.c',
+  'efl_ui_test_collection.c',
+  'efl_ui_test_list_collection.c',
+  'efl_ui_test_grid_collection.c',
   'efl_ui_test_position_manager_common.c',
 ]