41 files changed, 88 insertions, 88 deletions
diff --git a/examples/blockingmaster/dialog.cpp b/examples/blockingmaster/dialog.cpp
index 477e4c3..74c5fef 100644
--- a/examples/blockingmaster/dialog.cpp
+++ b/examples/blockingmaster/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp
index 48f0695..9a998fa 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/blockingmaster/masterthread.cpp
@@ -41,7 +41,7 @@
 
 #include "masterthread.h"
 
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 #include <QTime>
 
diff --git a/examples/blockingslave/dialog.cpp b/examples/blockingslave/dialog.cpp
index d0c9abd..5788113 100644
--- a/examples/blockingslave/dialog.cpp
+++ b/examples/blockingslave/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/blockingslave/slavethread.cpp b/examples/blockingslave/slavethread.cpp
index 6e47ba9..3ac8898 100644
--- a/examples/blockingslave/slavethread.cpp
+++ b/examples/blockingslave/slavethread.cpp
@@ -41,7 +41,7 @@
 
 #include "slavethread.h"
 
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 #include <QTime>
 
diff --git a/examples/cenumerator/main.cpp b/examples/cenumerator/main.cpp
index cd93430..83e99cf 100644
--- a/examples/cenumerator/main.cpp
+++ b/examples/cenumerator/main.cpp
@@ -41,7 +41,7 @@
 
 #include <QTextStream>
 #include <QCoreApplication>
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/enumerator/main.cpp b/examples/enumerator/main.cpp
index f08e122..396209e 100644
--- a/examples/enumerator/main.cpp
+++ b/examples/enumerator/main.cpp
@@ -44,7 +44,7 @@
 #include <QWidget>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/master/dialog.cpp b/examples/master/dialog.cpp
index f015125..71fb202 100644
--- a/examples/master/dialog.cpp
+++ b/examples/master/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/master/dialog.h b/examples/master/dialog.h
index b29768b..93348a5 100644
--- a/examples/master/dialog.h
+++ b/examples/master/dialog.h
@@ -45,7 +45,7 @@
 #include <QDialog>
 #include <QTimer>
 
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/slave/dialog.cpp b/examples/slave/dialog.cpp
index 900adf7..2d00d2b 100644
--- a/examples/slave/dialog.cpp
+++ b/examples/slave/dialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QGridLayout>
 
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/slave/dialog.h b/examples/slave/dialog.h
index 7659495..1b0c704 100644
--- a/examples/slave/dialog.h
+++ b/examples/slave/dialog.h
@@ -45,7 +45,7 @@
 #include <QDialog>
 #include <QTimer>
 
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
diff --git a/examples/slave/slavethread.cpp b/examples/slave/slavethread.cpp
index f33342a..d18e2cc 100644
--- a/examples/slave/slavethread.cpp
+++ b/examples/slave/slavethread.cpp
@@ -41,7 +41,7 @@
 
 #include "slavethread.h"
 
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 #include <QTime>
 
diff --git a/examples/terminal/mainwindow.cpp b/examples/terminal/mainwindow.cpp
index 4d67cbb..b2d276c 100644
--- a/examples/terminal/mainwindow.cpp
+++ b/examples/terminal/mainwindow.cpp
@@ -46,7 +46,7 @@
 #include "settingsdialog.h"
 
 #include <QMessageBox>
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 //! [0]
 MainWindow::MainWindow(QWidget *parent) :
diff --git a/examples/terminal/mainwindow.h b/examples/terminal/mainwindow.h
index dccaefe..7e248d4 100644
--- a/examples/terminal/mainwindow.h
+++ b/examples/terminal/mainwindow.h
@@ -47,7 +47,7 @@
 
 #include <QMainWindow>
 
-#include <QtSerialPort/serialport-global.h>
+#include <QtSerialPort/qserialport-global.h>
 
 namespace Ui {
 class MainWindow;
diff --git a/examples/terminal/settingsdialog.cpp b/examples/terminal/settingsdialog.cpp
index 67ad551..63044f9 100644
--- a/examples/terminal/settingsdialog.cpp
+++ b/examples/terminal/settingsdialog.cpp
@@ -43,7 +43,7 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
-#include <QtSerialPort/serialportinfo.h>
+#include <QtSerialPort/qserialportinfo.h>
 #include <QIntValidator>
 #include <QLineEdit>
 
diff --git a/examples/terminal/settingsdialog.h b/examples/terminal/settingsdialog.h
index 29676b6..ce1519b 100644
--- a/examples/terminal/settingsdialog.h
+++ b/examples/terminal/settingsdialog.h
@@ -44,7 +44,7 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialport.h>
 
 namespace Ui {
 class SettingsDialog;
diff --git a/src/serialport/serialport-global.h b/src/serialport/qserialport-global.h
index 839650f..839650f 100644
--- a/src/serialport/serialport-global.h
+++ b/src/serialport/qserialport-global.h
diff --git a/src/serialport/serialport.cpp b/src/serialport/qserialport.cpp
index 1d0beea..955eaba 100644
--- a/src/serialport/serialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -42,15 +42,15 @@
 **
 ****************************************************************************/
 
-#include "serialport.h"
-#include "serialportinfo.h"
+#include "qserialport.h"
+#include "qserialportinfo.h"
 
 #ifdef Q_OS_WIN
-#include "serialport_win_p.h"
+#include "qserialport_win_p.h"
 #elif defined (Q_OS_SYMBIAN)
-#include "serialport_symbian_p.h"
+#include "qserialport_symbian_p.h"
 #elif defined (Q_OS_UNIX)
-#include "serialport_unix_p.h"
+#include "qserialport_unix_p.h"
 #else
 #error Unsupported OS
 #endif
@@ -1159,6 +1159,6 @@ qint64 QSerialPort::writeData(const char *data, qint64 maxSize)
     \sa setBreak(), sendBreak()
 */
 
-#include "moc_serialport.cpp"
+#include "moc_qserialport.cpp"
 
 QT_END_NAMESPACE_SERIALPORT
diff --git a/src/serialport/serialport.h b/src/serialport/qserialport.h
index af1b2da..68438f3 100644
--- a/src/serialport/serialport.h
+++ b/src/serialport/qserialport.h
@@ -40,12 +40,12 @@
 **
 ****************************************************************************/
 
-#ifndef QSERIALPORT_H
-#define QSERIALPORT_H
+#ifndef SERIALPORT_H
+#define SERIALPORT_H
 
 #include <QtCore/qiodevice.h>
 
-#include "serialport-global.h"
+#include "qserialport-global.h"
 
 QT_BEGIN_NAMESPACE_SERIALPORT
 
@@ -252,4 +252,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSerialPort::Lines)
 
 QT_END_NAMESPACE_SERIALPORT
 
-#endif // QSERIALPORT_H
+#endif // SERIALPORT_H
diff --git a/src/serialport/serialport_p.h b/src/serialport/qserialport_p.h
index caca381..2528d00 100644
--- a/src/serialport/serialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -44,7 +44,7 @@
 #ifndef QSERIALPORT_P_H
 #define QSERIALPORT_P_H
 
-#include "serialport.h"
+#include "qserialport.h"
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <private/qringbuffer_p.h>
diff --git a/src/serialport/serialport_symbian.cpp b/src/serialport/qserialport_symbian.cpp
index 46bf80d..0cbdc59 100644
--- a/src/serialport/serialport_symbian.cpp
+++ b/src/serialport/qserialport_symbian.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "serialport_symbian_p.h"
+#include "qserialport_symbian_p.h"
 
 #include <e32base.h>
 //#include <e32test.h>
diff --git a/src/serialport/serialport_symbian_p.h b/src/serialport/qserialport_symbian_p.h
index ae924fc..3342357 100644
--- a/src/serialport/serialport_symbian_p.h
+++ b/src/serialport/qserialport_symbian_p.h
@@ -42,7 +42,7 @@
 #ifndef QSERIALPORT_SYMBIAN_P_H
 #define QSERIALPORT_SYMBIAN_P_H
 
-#include "serialport_p.h"
+#include "qserialport_p.h"
 
 #include <c32comm.h>
 
diff --git a/src/serialport/serialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 6297660..23df0f8 100644
--- a/src/serialport/serialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -41,7 +41,7 @@
 **
 ****************************************************************************/
 
-#include "serialport_unix_p.h"
+#include "qserialport_unix_p.h"
 #include "ttylocker_unix_p.h"
 
 #include <errno.h>
diff --git a/src/serialport/serialport_unix_p.h b/src/serialport/qserialport_unix_p.h
index 6db5b31..f657053 100644
--- a/src/serialport/serialport_unix_p.h
+++ b/src/serialport/qserialport_unix_p.h
@@ -43,7 +43,7 @@
 #ifndef QSERIALPORT_UNIX_P_H
 #define QSERIALPORT_UNIX_P_H
 
-#include "serialport_p.h"
+#include "qserialport_p.h"
 
 #include <limits.h>
 #include <termios.h>
diff --git a/src/serialport/serialport_win.cpp b/src/serialport/qserialport_win.cpp
index 78d9b8d..5848c1a 100644
--- a/src/serialport/serialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -41,7 +41,7 @@
 **
 ****************************************************************************/
 
-#include "serialport_win_p.h"
+#include "qserialport_win_p.h"
 
 #ifndef Q_OS_WINCE
 #include <QtCore/qelapsedtimer.h>
diff --git a/src/serialport/serialport_win_p.h b/src/serialport/qserialport_win_p.h
index c5492c1..3376fc8 100644
--- a/src/serialport/serialport_win_p.h
+++ b/src/serialport/qserialport_win_p.h
@@ -43,7 +43,7 @@
 #ifndef QSERIALPORT_WIN_P_H
 #define QSERIALPORT_WIN_P_H
 
-#include "serialport_p.h"
+#include "qserialport_p.h"
 
 #include <qt_windows.h>
 
@@ -159,4 +159,4 @@ private:
 
 QT_END_NAMESPACE_SERIALPORT
 
-#endif // SERIALPORT_WIN_P_H
+#endif // QSERIALPORT_WIN_P_H
diff --git a/src/serialport/serialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index a19cddf..4da574d 100644
--- a/src/serialport/serialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -41,7 +41,7 @@
 **
 ****************************************************************************/
 
-#include "serialport_win_p.h"
+#include "qserialport_win_p.h"
 
 #include <QtCore/qelapsedtimer.h>
 
@@ -485,6 +485,6 @@ QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location)
     return ret;
 }
 
-#include "serialport_wince.moc"
+#include "qserialport_wince.moc"
 
 QT_END_NAMESPACE_SERIALPORT
diff --git a/src/serialport/serialportinfo.cpp b/src/serialport/qserialportinfo.cpp
index 30d7e01..f8afe0a 100644
--- a/src/serialport/serialportinfo.cpp
+++ b/src/serialport/qserialportinfo.cpp
@@ -41,9 +41,9 @@
 **
 ****************************************************************************/
 
-#include "serialportinfo.h"
-#include "serialportinfo_p.h"
-#include "serialport.h"
+#include "qserialportinfo.h"
+#include "qserialportinfo_p.h"
+#include "qserialport.h"
 
 QT_BEGIN_NAMESPACE_SERIALPORT
 
diff --git a/src/serialport/serialportinfo.h b/src/serialport/qserialportinfo.h
index 9d33b33..a553daa 100644
--- a/src/serialport/serialportinfo.h
+++ b/src/serialport/qserialportinfo.h
@@ -40,13 +40,13 @@
 **
 ****************************************************************************/
 
-#ifndef SERIALPORTINFO_H
-#define SERIALPORTINFO_H
+#ifndef QSERIALPORTINFO_H
+#define QSERIALPORTINFO_H
 
 #include <QtCore/qlist.h>
 #include <QtCore/qscopedpointer.h>
 
-#include "serialport-global.h"
+#include "qserialport-global.h"
 
 QT_BEGIN_NAMESPACE_SERIALPORT
 
@@ -90,4 +90,4 @@ inline bool QSerialPortInfo::isNull() const
 
 QT_END_NAMESPACE_SERIALPORT
 
-#endif // SERIALPORTINFO_H
+#endif // QSERIALPORTINFO_H
diff --git a/src/serialport/serialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp
index 60398b3..32bc952 100644
--- a/src/serialport/serialportinfo_mac.cpp
+++ b/src/serialport/qserialportinfo_mac.cpp
@@ -41,8 +41,8 @@
 **
 ****************************************************************************/
 
-#include "serialportinfo.h"
-#include "serialportinfo_p.h"
+#include "qserialportinfo.h"
+#include "qserialportinfo_p.h"
 
 #include <sys/param.h>
 
diff --git a/src/serialport/serialportinfo_p.h b/src/serialport/qserialportinfo_p.h
index b50ba9d..a5f8bba 100644
--- a/src/serialport/serialportinfo_p.h
+++ b/src/serialport/qserialportinfo_p.h
@@ -44,7 +44,7 @@
 #ifndef QSERIALPORTINFO_P_H
 #define QSERIALPORTINFO_P_H
 
-#include "serialport-global.h"
+#include "qserialport-global.h"
 
 #include <QtCore/qstring.h>
 
diff --git a/src/serialport/serialportinfo_symbian.cpp b/src/serialport/qserialportinfo_symbian.cpp
index 15561ac..ab84279 100644
--- a/src/serialport/serialportinfo_symbian.cpp
+++ b/src/serialport/qserialportinfo_symbian.cpp
@@ -41,9 +41,9 @@
 **
 ****************************************************************************/
 
-#include "serialportinfo.h"
-#include "serialportinfo_p.h"
-#include "serialport_symbian_p.h"
+#include "qserialportinfo.h"
+#include "qserialportinfo_p.h"
+#include "qserialport_symbian_p.h"
 
 #include <e32base.h>
 //#include <e32test.h>
diff --git a/src/serialport/serialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index f85dda6..5a8e5c2 100644
--- a/src/serialport/serialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -41,10 +41,10 @@
 **
 ****************************************************************************/
 
-#include "serialportinfo.h"
-#include "serialportinfo_p.h"
+#include "qserialportinfo.h"
+#include "qserialportinfo_p.h"
 #include "ttylocker_unix_p.h"
-#include "serialport_unix_p.h"
+#include "qserialport_unix_p.h"
 #include <QtCore/qfile.h>
 
 #ifndef Q_OS_MAC
diff --git a/src/serialport/serialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp
index b7fc2e9..94106f1 100644
--- a/src/serialport/serialportinfo_win.cpp
+++ b/src/serialport/qserialportinfo_win.cpp
@@ -41,9 +41,9 @@
 **
 ****************************************************************************/
 
-#include "serialportinfo.h"
-#include "serialportinfo_p.h"
-#include "serialport_win_p.h"
+#include "qserialportinfo.h"
+#include "qserialportinfo_p.h"
+#include "qserialport_win_p.h"
 
 #ifndef Q_OS_WINCE
 #include <initguid.h>
diff --git a/src/serialport/serialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp
index c77b806..2b86818 100644
--- a/src/serialport/serialportinfo_wince.cpp
+++ b/src/serialport/qserialportinfo_wince.cpp
@@ -41,9 +41,9 @@
 **
 ****************************************************************************/
 
-#include "serialportinfo.h"
-#include "serialportinfo_p.h"
-#include "serialport_win_p.h"
+#include "qserialportinfo.h"
+#include "qserialportinfo_p.h"
+#include "qserialport_win_p.h"
 
 #include <QtCore/qstringlist.h>
 
diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri
index 46ed058..7567665 100644
--- a/src/serialport/serialport-lib.pri
+++ b/src/serialport/serialport-lib.pri
@@ -3,32 +3,32 @@ INCLUDEPATH += $$PWD
 linux*:DEFINES += HAVE_LIBUDEV
 
 PUBLIC_HEADERS += \
-    $$PWD/serialport-global.h \
-    $$PWD/serialport.h \
-    $$PWD/serialportinfo.h
+    $$PWD/qserialport-global.h \
+    $$PWD/qserialport.h \
+    $$PWD/qserialportinfo.h
 
 PRIVATE_HEADERS += \
-    $$PWD/serialport_p.h \
-    $$PWD/serialportinfo_p.h
+    $$PWD/qserialport_p.h \
+    $$PWD/qserialportinfo_p.h
 
 SOURCES += \
-    $$PWD/serialport.cpp \
-    $$PWD/serialportinfo.cpp
+    $$PWD/qserialport.cpp \
+    $$PWD/qserialportinfo.cpp
 
 win32 {
     PRIVATE_HEADERS += \
-        $$PWD/serialport_win_p.h
+        $$PWD/qserialport_win_p.h
 
     SOURCES += \
-        $$PWD/serialport_win.cpp \
-        $$PWD/serialportinfo_win.cpp
+        $$PWD/qserialport_win.cpp \
+        $$PWD/qserialportinfo_win.cpp
 
     !wince*: {
         LIBS += -lsetupapi -ladvapi32
     } else {
         SOURCES += \
-            $$PWD/serialport_wince.cpp \
-            $$PWD/serialportinfo_wince.cpp
+            $$PWD/qserialport_wince.cpp \
+            $$PWD/qserialportinfo_wince.cpp
     }
 }
 
@@ -47,11 +47,11 @@ symbian {
     INCLUDEPATH += c:/QtSDK/Symbian/SDKs/Symbian3Qt473/epoc32/include/platform
 
     PRIVATE_HEADERS += \
-        $$PWD/serialport_symbian_p.h
+        $$PWD/qserialport_symbian_p.h
 
     SOURCES += \
-        $$PWD/serialport_symbian.cpp \
-        $$PWD/serialportinfo_symbian.cpp
+        $$PWD/qserialport_symbian.cpp \
+        $$PWD/qserialportinfo_symbian.cpp
 
     LIBS += -leuser -lefsrv -lc32
 }
@@ -59,15 +59,15 @@ symbian {
 unix:!symbian {
     PRIVATE_HEADERS += \
         $$PWD/ttylocker_unix_p.h \
-        $$PWD/serialport_unix_p.h
+        $$PWD/qserialport_unix_p.h
 
     SOURCES += \
         $$PWD/ttylocker_unix.cpp \
-        $$PWD/serialport_unix.cpp \
-        $$PWD/serialportinfo_unix.cpp
+        $$PWD/qserialport_unix.cpp \
+        $$PWD/qserialportinfo_unix.cpp
 
     macx {
-        SOURCES += $$PWD/serialportinfo_mac.cpp
+        SOURCES += $$PWD/qserialportinfo_mac.cpp
 
         LIBS += -framework IOKit -framework CoreFoundation
     } else {
diff --git a/src/serialport/ttylocker_unix_p.h b/src/serialport/ttylocker_unix_p.h
index e5c47f5..2aca632 100644
--- a/src/serialport/ttylocker_unix_p.h
+++ b/src/serialport/ttylocker_unix_p.h
@@ -42,7 +42,7 @@
 #ifndef TTYLOCKER_UNIX_P_H
 #define TTYLOCKER_UNIX_P_H
 
-#include "serialport-global.h"
+#include "qserialport-global.h"
 
 QT_BEGIN_NAMESPACE_SERIALPORT
 
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index b8ca5da..1f4e4eb 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 CONFIG = ordered
-SUBDIRS += serialportinfo serialport
+SUBDIRS += qserialportinfo qserialport
diff --git a/tests/manual/serialport/serialport.pro b/tests/manual/qserialport/qserialport.pro
index 6490302..5ce5b6b 100644
--- a/tests/manual/serialport/serialport.pro
+++ b/tests/manual/qserialport/qserialport.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
-TARGET = tst_serialport
+TARGET = tst_qserialport
 
 QT = core testlib
 greaterThan(QT_MAJOR_VERSION, 4) {
@@ -8,4 +8,4 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf)
 }
 
-SOURCES += tst_serialport.cpp
+SOURCES += tst_qserialport.cpp
diff --git a/tests/manual/serialport/tst_serialport.cpp b/tests/manual/qserialport/tst_qserialport.cpp
index f601e4d..c74218e 100644
--- a/tests/manual/serialport/tst_serialport.cpp
+++ b/tests/manual/qserialport/tst_qserialport.cpp
@@ -42,8 +42,8 @@
 #include <QtTest/QtTest>
 #include <QtCore/QDebug>
 
-#include <QtSerialPort/serialportinfo.h>
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialportinfo.h>
+#include <QtSerialPort/qserialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
@@ -217,4 +217,4 @@ void tst_QSerialPort::flowControl()
 }
 
 QTEST_MAIN(tst_QSerialPort)
-#include "tst_serialport.moc"
+#include "tst_qserialport.moc"
diff --git a/tests/manual/serialportinfo/serialportinfo.pro b/tests/manual/qserialportinfo/qserialportinfo.pro
index 75ccd0c..a55c6f9 100644
--- a/tests/manual/serialportinfo/serialportinfo.pro
+++ b/tests/manual/qserialportinfo/qserialportinfo.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
-TARGET = tst_serialportinfo
+TARGET = tst_qserialportinfo
 
 QT = core testlib
 greaterThan(QT_MAJOR_VERSION, 4) {
@@ -8,4 +8,4 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf)
 }
 
-SOURCES += tst_serialportinfo.cpp
+SOURCES += tst_qserialportinfo.cpp
diff --git a/tests/manual/serialportinfo/tst_serialportinfo.cpp b/tests/manual/qserialportinfo/tst_qserialportinfo.cpp
index 60ecb99..ffe2a5f 100644
--- a/tests/manual/serialportinfo/tst_serialportinfo.cpp
+++ b/tests/manual/qserialportinfo/tst_qserialportinfo.cpp
@@ -42,8 +42,8 @@
 #include <QtTest/QtTest>
 #include <QtCore/QDebug>
 
-#include <QtSerialPort/serialportinfo.h>
-#include <QtSerialPort/serialport.h>
+#include <QtSerialPort/qserialportinfo.h>
+#include <QtSerialPort/qserialport.h>
 
 QT_USE_NAMESPACE_SERIALPORT
 
@@ -84,4 +84,4 @@ void tst_QSerialPortInfo::assignment()
 }
 
 QTEST_MAIN(tst_QSerialPortInfo)
-#include "tst_serialportinfo.moc"
+#include "tst_qserialportinfo.moc"