diff --git a/Makefile.am b/Makefile.am
index e919962a5..dce4053af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,8 @@ METASOURCES = AUTO
 
 kdvipart_la_SOURCES = renderedDviPagePixmap.cpp dviPageCache.cpp \
 	kdvi_multipage.cpp kdvi_multipage_texthandling.cpp \
-	dviwin.cpp bigEndianByteReader.cpp infodialog.cpp \
-	psheader.c dviwin_draw.cpp dviwin_prescan.cpp dviwin_export.cpp \
+	dviRenderer.cpp bigEndianByteReader.cpp infodialog.cpp \
+	psheader.c dviRenderer_draw.cpp dviRenderer_prescan.cpp dviRenderer_export.cpp \
 	dviFile.cpp fontpool.cpp fontprogress.cpp psgs.cpp \
 	fontMap.cpp fontEncoding.cpp fontEncodingPool.cpp \
 	special.cpp util.cpp vf.cpp glyph.cpp \
@@ -43,7 +43,7 @@ kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts
 
 ## this option you can leave out. Just, if you use "make dist", you need it
-noinst_HEADERS = dvi.h dviwin.h xdvi.h
+noinst_HEADERS = dvi.h dviRenderer.h xdvi.h
 
 messages: rc.cpp
 	$(PREPARETIPS) > tips.cpp
diff --git a/TeXFontDefinition.cpp b/TeXFontDefinition.cpp
index f7c2cd21b..b1105e487 100644
--- a/TeXFontDefinition.cpp
+++ b/TeXFontDefinition.cpp
@@ -5,7 +5,7 @@
 #include <qfile.h>
 
 #include "../config.h"
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "fontpool.h"
 #include "kdvi.h"
 #ifdef HAVE_FREETYPE
diff --git a/dviFile.h b/dviFile.h
index 6a9919b58..942b214ed 100644
--- a/dviFile.h
+++ b/dviFile.h
@@ -51,12 +51,12 @@ class dvifile : public bigEndianByteReader
 
   /** This field is set to zero when the DVI file is constructed, and
       will be modified during the prescan phase (at this time the
-      prescan code still resides in the dviwin class) */
+      prescan code still resides in the dviRenderer class) */
   Q_UINT16       numberOfExternalPSFiles;
   
   /** This field is set to zero when the DVI file is constructed, and
       will be modified during the prescan phase (at this time the
-      prescan code still resides in the dviwin class) */
+      prescan code still resides in the dviRenderer class) */
   Q_UINT16       numberOfExternalNONPSFiles;
 
   Q_UINT32       beginning_of_postamble;
diff --git a/dviwin.cpp b/dviRenderer.cpp
similarity index 99%
rename from dviwin.cpp
rename to dviRenderer.cpp
index 036285aed..38ed78de8 100644
--- a/dviwin.cpp
+++ b/dviRenderer.cpp
@@ -42,7 +42,7 @@
 #include <kstdguiitem.h>
 
 #include "documentWidget.h"
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "fontpool.h"
 #include "fontprogress.h"
 #include "kdvi_multipage.h"
@@ -52,7 +52,7 @@
 #include "dvisourcesplitter.h"
 #include "renderedDviPagePixmap.h"
 
-//#define DEBUG_DVIWIN
+//#define DEBUG_DVIRENDERER
 
 QPainter *foreGroundPaint; // QPainter used for text
 
@@ -62,7 +62,7 @@ QPainter *foreGroundPaint; // QPainter used for text
 dviRenderer::dviRenderer(QWidget *par)
   : DocumentRenderer(par), info(new infoDialog(par))
 {
-#ifdef DEBUG_DVIWIN
+#ifdef DEBUG_DVIRENDERER
   kdDebug(4300) << "dviRenderer( parent=" << par << " )" << endl;
 #endif
 
@@ -101,7 +101,7 @@ dviRenderer::dviRenderer(QWidget *par)
 
 dviRenderer::~dviRenderer()
 {
-#ifdef DEBUG_DVIWIN
+#ifdef DEBUG_DVIRENDERER
   kdDebug(4300) << "~dviRenderer" << endl;
 #endif
 
@@ -142,7 +142,7 @@ void dviRenderer::showInfo(void)
 
 void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page)
 {
-#ifdef DEBUG_DVIWIN
+#ifdef DEBUG_DVIRENDERER
   kdDebug(4300) << "dviRenderer::drawPage(documentPage *) called, page number " << page->getPageNumber() << endl;
 #endif
   
@@ -284,7 +284,7 @@ void dviRenderer::showThatSourceInformationIsPresent(void)
 
 void dviRenderer::embedPostScript(void)
 {
-#ifdef DEBUG_DVIWIN
+#ifdef DEBUG_DVIRENDERER
   kdDebug(4300) << "dviRenderer::embedPostScript()" << endl;
 #endif
 
@@ -390,7 +390,7 @@ bool dviRenderer::isValidFile(const QString filename)
 
 bool dviRenderer::setFile(const QString &fname)
 {
-#ifdef DEBUG_DVIWIN
+#ifdef DEBUG_DVIRENDERER
   kdDebug(4300) << "dviRenderer::setFile( fname='" << fname << "', ref='" << ref << "', sourceMarker=" << sourceMarker << " )" << endl;
 #endif
 
@@ -565,7 +565,7 @@ Anchor dviRenderer::parseReference(const QString &reference)
 {
   mutex.lock();
   
-#ifdef DEBUG_DVIWIN
+#ifdef DEBUG_DVIRENDERER
   kdError(4300) << "dviRenderer::parseReference( " << reference << " ) called" << endl;
 #endif
   
@@ -785,4 +785,4 @@ void dviRenderer::handleSRCLink(const QString &linkText, QMouseEvent *e, Documen
 }
 
 
-#include "dviwin.moc"
+#include "dviRenderer.moc"
diff --git a/dviwin.h b/dviRenderer.h
similarity index 99%
rename from dviwin.h
rename to dviRenderer.h
index 9b1297fb1..02d7cfcc8 100644
--- a/dviwin.h
+++ b/dviRenderer.h
@@ -7,8 +7,8 @@
 // (C) 2001-2004 Stefan Kebekus. Distributed under the GPL.
 
 
-#ifndef _dviwin_h_
-#define _dviwin_h_
+#ifndef _dvirenderer_h_
+#define _dvirenderer_h_
 
 
 #include <qevent.h>
diff --git a/dviwin_draw.cpp b/dviRenderer_draw.cpp
similarity index 99%
rename from dviwin_draw.cpp
rename to dviRenderer_draw.cpp
index ffffa7b13..02b6fa354 100644
--- a/dviwin_draw.cpp
+++ b/dviRenderer_draw.cpp
@@ -51,7 +51,7 @@
 
 //#define DEBUG_RENDER 0
 
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "dvi.h"
 #include "fontpool.h"
 #include "kdvi_multipage.h"
diff --git a/dviwin_export.cpp b/dviRenderer_export.cpp
similarity index 99%
rename from dviwin_export.cpp
rename to dviRenderer_export.cpp
index ff7637c83..77b79713c 100644
--- a/dviwin_export.cpp
+++ b/dviRenderer_export.cpp
@@ -38,7 +38,7 @@
 #include <qpainter.h>
 
 
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "fontprogress.h"
 #include "kdvi_multipage.h"
 
diff --git a/dviwin_prescan.cpp b/dviRenderer_prescan.cpp
similarity index 99%
rename from dviwin_prescan.cpp
rename to dviRenderer_prescan.cpp
index 9011cc461..eb73fe784 100644
--- a/dviwin_prescan.cpp
+++ b/dviRenderer_prescan.cpp
@@ -1,11 +1,11 @@
-// dviwin_prescan.cpp
+// dviRenderer_prescan.cpp
 //
 // Part of KDVI - A DVI previewer for the KDE desktop environemt 
 //
 // (C) 2003--2004 Stefan Kebekus
 // Distributed under the GPL
 
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "dvi.h"
 #include "fontpool.h"
 #include "kdvi_multipage.h"
diff --git a/kdvi_multipage.h b/kdvi_multipage.h
index 4e63c2314..ee3f5e2e3 100644
--- a/kdvi_multipage.h
+++ b/kdvi_multipage.h
@@ -6,7 +6,7 @@
 class KPrinter;
 
 #include "../kviewshell/kmultipage.h"
-#include "dviwin.h"
+#include "dviRenderer.h"
 
 class KDVIMultiPage : public KMultiPage
 {
diff --git a/special.cpp b/special.cpp
index c9e6c0992..9d0c975ee 100644
--- a/special.cpp
+++ b/special.cpp
@@ -1,7 +1,7 @@
 
 // special.cpp
 
-// Methods for dviwin which deal with "\special" commands found in the
+// Methods for dviRenderer which deal with "\special" commands found in the
 // DVI file
 
 // Copyright 2000--2004, Stefan Kebekus (kebekus@kde.org).
@@ -17,7 +17,7 @@
 #include <qimage.h>
 #include <qstringlist.h>
 
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "kdvi.h"
 #include "kdvi_multipage.h"
 #include "xdvi.h"
diff --git a/util.cpp b/util.cpp
index f23b3831a..e9f91b6bc 100644
--- a/util.cpp
+++ b/util.cpp
@@ -53,7 +53,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "xdvi.h"
 
 
diff --git a/vf.cpp b/vf.cpp
index 7eb03e04e..13870be84 100644
--- a/vf.cpp
+++ b/vf.cpp
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "dvi.h"
-#include "dviwin.h"
+#include "dviRenderer.h"
 #include "fontpool.h"
 #include "xdvi.h"