diff --git a/generators/chm/generator_chm.cpp b/generators/chm/generator_chm.cpp
index 60a004d11..7d3ed52b1 100644
--- a/generators/chm/generator_chm.cpp
+++ b/generators/chm/generator_chm.cpp
@@ -86,7 +86,7 @@ void CHMGenerator::preparePageForSyncOperation( int zoom , const QString & url)
     kDebug() << "Url: " << pAddress  << endl;
     m_syncGen->setZoomFactor(zoom);
     m_doneFlagSet=false;
-    m_syncGen->openURL(pAddress);
+    m_syncGen->openUrl(pAddress);
     m_syncGen->view()->layout();
     while (!m_doneFlagSet) { qApp->processEvents(QEventLoop::AllEvents, 50); }
 }
@@ -192,7 +192,7 @@ void CHMGenerator::generatePixmap( PixmapRequest * request )
     m_request=request;
     m_state=1;
     // will emit openURL without problems
-    m_syncGen->openURL ( pAddress );
+    m_syncGen->openUrl ( pAddress );
 }
 
 
diff --git a/part.cpp b/part.cpp
index 255080f25..7b4e61aae 100644
--- a/part.cpp
+++ b/part.cpp
@@ -349,9 +349,9 @@ Part::~Part()
 
 void Part::openURLFromDocument(const KUrl &url)
 {
-    m_bExtension->openURLNotify();
-    m_bExtension->setLocationBarURL(url.prettyUrl());
-    openURL(url);
+    m_bExtension->openUrlNotify();
+    m_bExtension->setLocationBarUrl(url.prettyUrl());
+    openUrl(url);
 }
 
 void Part::supportedMimetypes()
@@ -608,7 +608,7 @@ bool Part::openURL(const KUrl &url)
     // KTar and proceed with the URL of the temporary file
 
     // this calls in sequence the 'closeURL' and 'openFile' methods
-    bool openOk = KParts::ReadOnlyPart::openURL(url);
+    bool openOk = KParts::ReadOnlyPart::openUrl(url);
 
     if ( openOk )
     {
@@ -660,7 +660,7 @@ bool Part::closeURL()
     m_document->closeDocument();
     updateViewActions();
     m_searchWidget->clearText();
-    return KParts::ReadOnlyPart::closeURL();
+    return KParts::ReadOnlyPart::closeUrl();
 }
 
 void Part::close()
@@ -730,7 +730,7 @@ void Part::slotDoFileDirty()
     }
 
     // close and (try to) reopen the document
-    if ( KParts::ReadOnlyPart::openURL(m_file) )
+    if ( KParts::ReadOnlyPart::openUrl(m_file) )
     {
         // on successfull opening, restore the previous viewport
         if ( m_viewportDirty.pageNumber >= (int) m_document->pages() ) 
diff --git a/shell/shell.cpp b/shell/shell.cpp
index 4f7e1410c..070a8bdc5 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -128,7 +128,7 @@ void Shell::openURL( const KUrl & url )
 {
     if ( m_part )
     {
-        bool openOk = m_part->openURL( url );
+        bool openOk = m_part->openUrl( url );
         if ( openOk ) m_recent->addUrl( url );
         else m_recent->removeUrl( url );
     }
diff --git a/ui/embeddedfilesdialog.cpp b/ui/embeddedfilesdialog.cpp
index 9db1e7f92..b4f68072b 100644
--- a/ui/embeddedfilesdialog.cpp
+++ b/ui/embeddedfilesdialog.cpp
@@ -44,7 +44,7 @@ EmbeddedFilesDialog::EmbeddedFilesDialog(QWidget *parent, const KPDFDocument *do
 		KMimeType::Ptr mime = KMimeType::findByPath( ef->name(), 0, true );
 		if (mime)
 		{
-			twi->setIcon(0, KIcon(mime->icon()));
+			twi->setIcon(0, KIcon(mime->iconName()));
 		}
 		twi->setText(1, ef->description());
 		twi->setText(2, KGlobal::locale()->formatDateTime( ef->creationDate(), false, true ));
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index c6678f28a..364f5c189 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -1507,7 +1507,7 @@ if (d->document->handleEvent( e ) )
                         d->messageWindow->display( i18n( "File not saved." ), PageViewMessage::Warning );
                     else
                     {
-                        KMimeType::Ptr mime = KMimeType::findByURL( fileName );
+                        KMimeType::Ptr mime = KMimeType::findByUrl( fileName );
                         QString type;
                         if ( !mime )
                             type = "PNG";