diff --git a/doc/html/ntqassistantclient.html b/doc/html/ntqassistantclient.html
index c28fb5b4..6ed91bcd 100644
--- a/doc/html/ntqassistantclient.html
+++ b/doc/html/ntqassistantclient.html
@@ -81,12 +81,12 @@ emitted. Similarly when closeAssistant() is called,
 <a href="#assistantClosed">assistantClosed</a>() is emitted. In either case, if an error occurs,
 <a href="#error">error</a>() is emitted.
 <p> This class is not included in the TQt library itself. To use it you
-must link against <tt>libqassistantclient.a</tt> (Unix) or <tt>qassistantclient.lib</tt> (Windows), which is built into <tt>INSTALL/lib</tt>
+must link against <tt>libtqassistantclient.a</tt> (Unix) or <tt>qassistantclient.lib</tt> (Windows), which is built into <tt>INSTALL/lib</tt>
 if you built the TQt tools (<tt>INSTALL</tt> is the directory where TQt is
 installed). If you use qmake, then you can simply add the following
 line to your pro file:
 <p> <pre>
-        LIBS += -lqassistantclient
+        LIBS += -ltqassistantclient
     </pre>
  
 <p> See also "Adding Documentation to TQt Assistant" in the <a href="assistant.html">TQt Assistant manual</a>.
diff --git a/doc/man/man3/tqassistantclient.3qt b/doc/man/man3/tqassistantclient.3qt
index cc4b10c4..0f3886e8 100644
--- a/doc/man/man3/tqassistantclient.3qt
+++ b/doc/man/man3/tqassistantclient.3qt
@@ -69,11 +69,11 @@ One QAssistantClient instance interacts with one Qt Assistant instance, so every
 .PP
 When you call openAssistant() the assistantOpened() signal is emitted. Similarly when closeAssistant() is called, assistantClosed() is emitted. In either case, if an error occurs, error() is emitted.
 .PP
-This class is not included in the Qt library itself. To use it you must link against \fClibqassistantclient.a\fR (Unix) or \fCqassistantclient.lib\fR (Windows), which is built into \fCINSTALL/lib\fR if you built the Qt tools (\fCINSTALL\fR is the directory where Qt is installed). If you use qmake, then you can simply add the following line to your pro file:
+This class is not included in the Qt library itself. To use it you must link against \fClibtqassistantclient.a\fR (Unix) or \fCqassistantclient.lib\fR (Windows), which is built into \fCINSTALL/lib\fR if you built the Qt tools (\fCINSTALL\fR is the directory where Qt is installed). If you use qmake, then you can simply add the following line to your pro file:
 .PP
 .nf
 .br
-        LIBS += -lqassistantclient
+        LIBS += -ltqassistantclient
 .br
 .fi
 .PP
diff --git a/examples/helpdemo/helpdemo.pro b/examples/helpdemo/helpdemo.pro
index ff62776d..ff95a29b 100644
--- a/examples/helpdemo/helpdemo.pro
+++ b/examples/helpdemo/helpdemo.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 
 CONFIG	+= qt warn_on
-LIBS    += -lqassistantclient
+LIBS    += -ltqassistantclient
 unix {
   UI_DIR = .ui
   MOC_DIR = .moc
diff --git a/examples/helpsystem/helpsystem.pro b/examples/helpsystem/helpsystem.pro
index 5f528049..cd1f6b5a 100644
--- a/examples/helpsystem/helpsystem.pro
+++ b/examples/helpsystem/helpsystem.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-LIBS    += -lqassistantclient
+LIBS    += -ltqassistantclient
 
 REQUIRES = full-config table
 
diff --git a/src/3rdparty/libpng/projects/borland/libpng.cpp b/src/3rdparty/libpng/projects/borland/libpng.cpp
index 4e2f274d..2708ad42 100644
--- a/src/3rdparty/libpng/projects/borland/libpng.cpp
+++ b/src/3rdparty/libpng/projects/borland/libpng.cpp
@@ -26,4 +26,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
     return 1;
 }
 //---------------------------------------------------------------------------
- 
\ No newline at end of file
diff --git a/src/3rdparty/libpng/projects/borland/zlib.cpp b/src/3rdparty/libpng/projects/borland/zlib.cpp
index 2cef71d5..3df15325 100644
--- a/src/3rdparty/libpng/projects/borland/zlib.cpp
+++ b/src/3rdparty/libpng/projects/borland/zlib.cpp
@@ -27,4 +27,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
     return 1;
 }
 //---------------------------------------------------------------------------
- 
\ No newline at end of file
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index a733c115..c63a491e 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -422,4 +422,4 @@ void TQEventLoop::appClosingDown()
 
 void TQEventLoop::setSingleToolkitEventHandling(bool enabled) {
     // Do nothing
-}
\ No newline at end of file
+}
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
index af1b1c6c..49fef0c1 100644
--- a/tools/assistant/lib/lib.pro
+++ b/tools/assistant/lib/lib.pro
@@ -1,5 +1,5 @@
 TEMPLATE        = lib
-TARGET		= qassistantclient
+TARGET		= tqassistantclient
 VERSION		= 1.0
 
 CONFIG		+= qt warn_on release
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index 4db090fb..d61043eb 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -84,14 +84,14 @@ static TQAssistantClientPrivate *data( const TQAssistantClient *client, bool cre
     error() is emitted.
 
     This class is not included in the TQt library itself. To use it you
-    must link against \c libqassistantclient.a (Unix) or \c
+    must link against \c libtqassistantclient.a (Unix) or \c
     qassistantclient.lib (Windows), which is built into \c INSTALL/lib
     if you built the TQt tools (\c INSTALL is the directory where TQt is
     installed). If you use qmake, then you can simply add the following
     line to your pro file:
 
     \code
-	LIBS += -lqassistantclient
+	LIBS += -ltqassistantclient
     \endcode
 
     See also "Adding Documentation to TQt Assistant" in the \link
diff --git a/tools/designer/app/app.pro b/tools/designer/app/app.pro
index 5d2aa406..9f6e54f7 100644
--- a/tools/designer/app/app.pro
+++ b/tools/designer/app/app.pro
@@ -6,11 +6,11 @@ DESTDIR		= $$QT_BUILD_TREE/bin
 
 SOURCES		+= main.cpp
 INCLUDEPATH	+= ../designer
-LIBS	+= -ldesignercore -ltqui -lqassistantclient -L$$QT_BUILD_TREE/lib
+LIBS	+= -ltqtdesignercore -ltqui -ltqassistantclient -L$$QT_BUILD_TREE/lib
 win32 {
    RC_FILE	= designer.rc
    win32-g++ {
-	TARGETDEPS += $$QT_BUILD_TREE/lib/libdesignercore.a
+	TARGETDEPS += $$QT_BUILD_TREE/lib/libtqtdesignercore.a
    } else {
 	TARGETDEPS += $$QT_BUILD_TREE/lib/designercore.lib
    }
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index b88eddbf..99cd0caa 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -186,8 +186,8 @@ int main( int argc, char *argv[] )
 	signal( SIGTERM, exitHandler );
     }
 
-    extern void qInitImages_designercore();
-    qInitImages_designercore();
+    extern void qInitImages_tqtdesignercore();
+    qInitImages_tqtdesignercore();
 
     TQSettings config;
     TQString keybase = DesignerApplication::settingsKey();
diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro
index 4ae5ff84..6311ad79 100644
--- a/tools/designer/designer/designer.pro
+++ b/tools/designer/designer/designer.pro
@@ -7,7 +7,7 @@ CONFIG 		-= dll
    CONFIG          += dll
 }
 
-TARGET	= designercore
+TARGET	= tqtdesignercore
 
 DEFINES	+= DESIGNER
 DEFINES += QT_INTERNAL_XML
@@ -420,11 +420,11 @@ INCLUDEPATH	+= ../shared ../uilib
 LIBS            += -L$$QT_BUILD_TREE/lib -ltqui
 
 hpux-acc* {
-	LIBS            += $$QT_BUILD_TREE/lib/libqassistantclient.a
+	LIBS            += $$QT_BUILD_TREE/lib/libtqassistantclient.a
 }
 
 !hpux-acc* {
-	LIBS		+= -lqassistantclient
+	LIBS		+= -ltqassistantclient
 }
 
 TRANSLATIONS	= designer_de.ts designer_fr.ts
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 7603148f..a112a0ba 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -156,8 +156,8 @@ MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir )
       fileFilter( tr( "TQt User-Interface Files (*.ui)" ) ), client( asClient ),
       previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 )
 {
-    extern void qInitImages_designercore();
-    qInitImages_designercore();
+    extern void qInitImages_tqtdesignercore();
+    qInitImages_tqtdesignercore();
 
     self = this;
     setPluginDirectory( plgDir );
diff --git a/tools/designer/editor/editor.pro b/tools/designer/editor/editor.pro
index dc9235f5..4a96f025 100644
--- a/tools/designer/editor/editor.pro
+++ b/tools/designer/editor/editor.pro
@@ -24,7 +24,7 @@ SOURCES		= editor.cpp \
 
 FORMS		= preferences.ui
 
-TARGET		= editor
+TARGET		= tqteditor
 DESTDIR		= ../../../lib
 VERSION		= 1.0.0
 
diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h
index a86d2844..83d17757 100644
--- a/tools/designer/examples/addressbook/addressbook.ui.h
+++ b/tools/designer/examples/addressbook/addressbook.ui.h
@@ -134,4 +134,4 @@ void AddressBook::searchAddress( const TQString &expr )
 	}
 	++it;
     }  
-}
\ No newline at end of file
+}
diff --git a/tools/designer/examples/addressbook/addressdetails.ui.h b/tools/designer/examples/addressbook/addressdetails.ui.h
index 60fe4ea2..b4e73924 100644
--- a/tools/designer/examples/addressbook/addressdetails.ui.h
+++ b/tools/designer/examples/addressbook/addressdetails.ui.h
@@ -21,4 +21,4 @@ void AddressDetails::okClicked()
 		     editCountry->text(),
 		     editZipCode->text() );
     close();
-}
\ No newline at end of file
+}
diff --git a/tools/designer/examples/addressbook/search.ui.h b/tools/designer/examples/addressbook/search.ui.h
index b660726c..67715379 100644
--- a/tools/designer/examples/addressbook/search.ui.h
+++ b/tools/designer/examples/addressbook/search.ui.h
@@ -10,4 +10,4 @@ void SearchDialog::search()
 {
     emit searchAddress( editSearch->text() );
     close();
-}
\ No newline at end of file
+}
diff --git a/tools/designer/plugins/cppeditor/cppeditor.pro b/tools/designer/plugins/cppeditor/cppeditor.pro
index 391c1d73..6cfdf8f1 100644
--- a/tools/designer/plugins/cppeditor/cppeditor.pro
+++ b/tools/designer/plugins/cppeditor/cppeditor.pro
@@ -12,9 +12,9 @@ VERSION		= 1.0.0
 INCLUDEPATH	+= ../../interfaces ../../editor $$QT_BUILD_TREE/tools/designer/editor
 
 hpux-* {
-	LIBS += $$QT_BUILD_TREE/lib/libeditor.a
+	LIBS += $$QT_BUILD_TREE/lib/libtqteditor.a
 } else {
-	LIBS    += -L$$QT_BUILD_TREE/lib -leditor
+	LIBS    += -L$$QT_BUILD_TREE/lib -ltqteditor
 }
 
 target.path += $$plugins.path/designer
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index 5053ed98..38f0f408 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -35,7 +35,7 @@ DESTDIR		= ../../../bin
 TARGET		= tqlinguist
 
 
-LIBS	+= -L$$QT_BUILD_TREE/lib -lqassistantclient
+LIBS	+= -L$$QT_BUILD_TREE/lib -ltqassistantclient
 
 win32:RC_FILE	= linguist.rc