diff --git a/core/Makefile.am b/core/Makefile.am
index 36779322e..74c774855 100644
--- a/core/Makefile.am
+++ b/core/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(srcdir)/generator_pdf -I$(srcdir)/.. -I$(srcdir)/../xpdf -I$(srcd
 
 METASOURCES = AUTO
 
-libkpdfcore_la_LIBADD = ./generator_pdf/libgeneratorpdf.la ./generator_png/libgeneratorpng.la
+libkpdfcore_la_LIBADD = ./generator_pdf/libgeneratorpdf.la ./generator_kimgio/libgeneratorkimgio.la
 libkpdfcore_la_SOURCES = document.cpp link.cpp page.cpp pagetransition.cpp
 
 noinst_LTLIBRARIES = libkpdfcore.la
diff --git a/core/document.cpp b/core/document.cpp
index 379aaf377..5d5a4e5cd 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -163,7 +163,7 @@ bool KPDFDocument::openDocument( const QString & docFile, const KURL & url )
             kdDebug() << *it << endl;
             if ( (*mime).is( *it ) )
             {
-                generator = new PNGGenerator( this );
+                generator = new KIMGIOGenerator( this );
                 break;
             }
             ++it;
diff --git a/core/generator_kimgio/Makefile.am b/core/generator_kimgio/Makefile.am
index 2c23f4bed..5a93221d1 100644
--- a/core/generator_kimgio/Makefile.am
+++ b/core/generator_kimgio/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(srcdir)/../../ $(all_includes)
 
-libgeneratorpng_la_LDFLAGS = $(all_libraries)
-libgeneratorpng_la_SOURCES = generator_png.cpp
+libgeneratorkimgio_la_LDFLAGS = $(all_libraries)
+libgeneratorkimgio_la_SOURCES = generator_kimgio.cpp
 
-noinst_LTLIBRARIES = libgeneratorpng.la
+noinst_LTLIBRARIES = libgeneratorkimgio.la
diff --git a/core/generator_kimgio/generator_png.cpp b/core/generator_kimgio/generator_kimgio.cpp
similarity index 66%
rename from core/generator_kimgio/generator_png.cpp
rename to core/generator_kimgio/generator_kimgio.cpp
index 775ff8e00..bb7546868 100644
--- a/core/generator_kimgio/generator_png.cpp
+++ b/core/generator_kimgio/generator_kimgio.cpp
@@ -12,18 +12,18 @@
 #include <kprinter.h>
 
 #include "core/page.h"
-#include "generator_png.h"
+#include "generator_kimgio.h"
 
-PNGGenerator::PNGGenerator( KPDFDocument * document ) : Generator( document )
+KIMGIOGenerator::KIMGIOGenerator( KPDFDocument * document ) : Generator( document )
 {
 }
 
-PNGGenerator::~PNGGenerator()
+KIMGIOGenerator::~KIMGIOGenerator()
 {
     delete m_pix;
 }
 
-bool PNGGenerator::loadDocument( const QString & fileName, QValueVector<KPDFPage*> & pagesVector )
+bool KIMGIOGenerator::loadDocument( const QString & fileName, QValueVector<KPDFPage*> & pagesVector )
 {
     m_pix = new QPixmap(fileName);
 
@@ -35,36 +35,36 @@ bool PNGGenerator::loadDocument( const QString & fileName, QValueVector<KPDFPage
     return true;
 }
 
-bool PNGGenerator::canGeneratePixmap()
+bool KIMGIOGenerator::canGeneratePixmap()
 {
     return true;
 }
 
-void PNGGenerator::generatePixmap( PixmapRequest * request )
+void KIMGIOGenerator::generatePixmap( PixmapRequest * request )
 {
     QPixmap *p = new QPixmap(*m_pix);
     request->page->setPixmap(request->id, p);
 }
 
-void PNGGenerator::generateSyncTextPage( KPDFPage * )
+void KIMGIOGenerator::generateSyncTextPage( KPDFPage * )
 {
 }
 
-bool PNGGenerator::supportsSearching() const
+bool KIMGIOGenerator::supportsSearching() const
 {
     return false;
 }
 
-bool PNGGenerator::hasFonts() const
+bool KIMGIOGenerator::hasFonts() const
 {
     return false;
 }
 
-void PNGGenerator::putFontInfo( KListView * )
+void KIMGIOGenerator::putFontInfo( KListView * )
 {
 }
 
-bool PNGGenerator::print( KPrinter& printer )
+bool KIMGIOGenerator::print( KPrinter& printer )
 {
     QPainter p(&printer);
     p.drawPixmap(0, 0, *m_pix);
diff --git a/core/generator_kimgio/generator_png.h b/core/generator_kimgio/generator_kimgio.h
similarity index 91%
rename from core/generator_kimgio/generator_png.h
rename to core/generator_kimgio/generator_kimgio.h
index 7a85db3c8..bda411f2d 100644
--- a/core/generator_kimgio/generator_png.h
+++ b/core/generator_kimgio/generator_kimgio.h
@@ -12,11 +12,11 @@
 
 #include "core/generator.h"
 
-class PNGGenerator : public Generator
+class KIMGIOGenerator : public Generator
 {
     public:
-        PNGGenerator( KPDFDocument * document );
-        virtual ~PNGGenerator();
+        KIMGIOGenerator( KPDFDocument * document );
+        virtual ~KIMGIOGenerator();
 
         // [INHERITED] load a document and fill up the pagesVector
         bool loadDocument( const QString & fileName, QValueVector<KPDFPage*> & pagesVector );