5 files changed, 21 insertions, 21 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 5b06760b..7c4ca224 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    creation \
-    objects
+    creationtime \
+    objectcount
diff --git a/tests/benchmarks/creation/creation.pro b/tests/benchmarks/creationtime/creationtime.pro
index 5750cb9f..050e29aa 100644
--- a/tests/benchmarks/creation/creation.pro
+++ b/tests/benchmarks/creationtime/creationtime.pro
@@ -1,9 +1,9 @@
 TEMPLATE = app
-TARGET = tst_creation
+TARGET = tst_creationtime
 
 QT += qml testlib
 CONFIG += testcase
 osx:CONFIG -= app_bundle
 
 SOURCES += \
-    tst_creation.cpp
+    tst_creationtime.cpp
diff --git a/tests/benchmarks/creation/tst_creation.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp
index 0f542ab9..a6b19d6c 100644
--- a/tests/benchmarks/creation/tst_creation.cpp
+++ b/tests/benchmarks/creationtime/tst_creationtime.cpp
@@ -39,7 +39,7 @@
 
 //#define QT_QUICK_CONTROLS_V1
 
-class tst_Creation : public QObject
+class tst_CreationTime : public QObject
 {
     Q_OBJECT
 
@@ -56,12 +56,12 @@ private:
     QQmlEngine engine;
 };
 
-void tst_Creation::initTestCase()
+void tst_CreationTime::initTestCase()
 {
     engine.clearComponentCache();
 }
 
-void tst_Creation::testControls()
+void tst_CreationTime::testControls()
 {
     QFETCH(QByteArray, control);
 
@@ -83,7 +83,7 @@ void tst_Creation::testControls()
     engine.clearComponentCache();
 }
 
-void tst_Creation::testControls_data()
+void tst_CreationTime::testControls_data()
 {
     QTest::addColumn<QByteArray>("control");
 
@@ -117,7 +117,7 @@ void tst_Creation::testControls_data()
     QTest::newRow("ToolButton") << QByteArray("ToolButton");
 }
 
-void tst_Creation::testCalendar()
+void tst_CreationTime::testCalendar()
 {
     QFETCH(QByteArray, control);
 
@@ -139,7 +139,7 @@ void tst_Creation::testCalendar()
     engine.clearComponentCache();
 }
 
-void tst_Creation::testCalendar_data()
+void tst_CreationTime::testCalendar_data()
 {
     QTest::addColumn<QByteArray>("control");
 
@@ -153,6 +153,6 @@ void tst_Creation::testCalendar_data()
 #endif
 }
 
-QTEST_MAIN(tst_Creation)
+QTEST_MAIN(tst_CreationTime)
 
-#include "tst_creation.moc"
+#include "tst_creationtime.moc"
diff --git a/tests/benchmarks/objects/objects.pro b/tests/benchmarks/objectcount/objectcount.pro
index 21429271..f54d72d6 100644
--- a/tests/benchmarks/objects/objects.pro
+++ b/tests/benchmarks/objectcount/objectcount.pro
@@ -1,9 +1,9 @@
 TEMPLATE = app
-TARGET = tst_objects
+TARGET = tst_objectcount
 
 QT += quick testlib core-private
 CONFIG += testcase
 osx:CONFIG -= app_bundle
 
 SOURCES += \
-    tst_objects.cpp
+    tst_objectcount.cpp
diff --git a/tests/benchmarks/objects/tst_objects.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index 96f97bd9..d8493730 100644
--- a/tests/benchmarks/objects/tst_objects.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -50,7 +50,7 @@ extern "C" Q_DECL_EXPORT void qt_removeQObject(QObject *object)
     qt_qobjects->removeAll(object);
 }
 
-class tst_Objects : public QObject
+class tst_ObjectCount : public QObject
 {
     Q_OBJECT
 
@@ -65,7 +65,7 @@ private:
     QQmlEngine engine;
 };
 
-void tst_Objects::init()
+void tst_ObjectCount::init()
 {
     qtHookData[QHooks::AddQObject] = reinterpret_cast<quintptr>(&qt_addQObject);
     qtHookData[QHooks::RemoveQObject] = reinterpret_cast<quintptr>(&qt_removeQObject);
@@ -76,13 +76,13 @@ void tst_Objects::init()
     delete component.create();
 }
 
-void tst_Objects::cleanup()
+void tst_ObjectCount::cleanup()
 {
     qtHookData[QHooks::AddQObject] = 0;
     qtHookData[QHooks::RemoveQObject] = 0;
 }
 
-void tst_Objects::testCount()
+void tst_ObjectCount::testCount()
 {
     QFETCH(QByteArray, v1);
     QFETCH(QByteArray, v2);
@@ -124,7 +124,7 @@ void tst_Objects::testCount()
     }
 }
 
-void tst_Objects::testCount_data()
+void tst_ObjectCount::testCount_data()
 {
     QTest::addColumn<QByteArray>("v1");
     QTest::addColumn<QByteArray>("v2");
@@ -226,6 +226,6 @@ void tst_Objects::testCount_data()
             << QByteArray("import QtQuick.Controls 2.0; ToolButton { }");
 }
 
-QTEST_MAIN(tst_Objects)
+QTEST_MAIN(tst_ObjectCount)
 
-#include "tst_objects.moc"
+#include "tst_objectcount.moc"