diff --git a/CMakeLists.txt b/CMakeLists.txt
index e98c1afc0..202906205 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(plasmagik_SRCS
 set(plasma_LIB_SRCS
     ${plasmagik_SRCS}
     abstractrunner.cpp
-    animator.cpp
+    animationdriver.cpp
     applet.cpp
     appletbrowser.cpp
     appletbrowser/customdragtreeview.cpp
@@ -99,7 +99,7 @@ install(FILES ${plasmagik_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/)
 
 set(plasma_LIB_INCLUDES
     abstractrunner.h
-    animator.h
+    animationdriver.h
     applet.h
     appletbrowser.h
     configxml.h
@@ -154,7 +154,7 @@ install(FILES
 
 install(FILES
     includes/AbstractRunner
-    includes/Animator
+    includes/AnimationDriver
     includes/Applet
     includes/AppletBrowser
     includes/ConfigXml
diff --git a/animator.cpp b/animationdriver.cpp
similarity index 98%
rename from animator.cpp
rename to animationdriver.cpp
index 801c5ee77..9aefb187c 100644
--- a/animator.cpp
+++ b/animationdriver.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "animator.h"
+#include "animationdriver.h"
 
 #include <QPainter>
 #include <QGraphicsItem>
@@ -143,4 +143,4 @@ void AnimationDriver::itemSlideOut(qreal progress, QGraphicsItem *item, const QP
 
 } // Plasma namespace
 
-#include "animator.moc"
+#include "animationdriver.moc"
diff --git a/animator.h b/animationdriver.h
similarity index 100%
rename from animator.h
rename to animationdriver.h
diff --git a/includes/AnimationDriver b/includes/AnimationDriver
new file mode 100644
index 000000000..44c18729c
--- /dev/null
+++ b/includes/AnimationDriver
@@ -0,0 +1 @@
+#include "../../plasma/animationdriver.h"
diff --git a/includes/Animator b/includes/Animator
deleted file mode 100644
index 3be3eaab2..000000000
--- a/includes/Animator
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../plasma/animator.h"
diff --git a/phase.cpp b/phase.cpp
index 5da578f40..84ce02e79 100644
--- a/phase.cpp
+++ b/phase.cpp
@@ -28,7 +28,7 @@
 #include <KServiceTypeTrader>
 #include <KGlobalSettings>
 
-#include "animator.h"
+#include "animationdriver.h"
 
 namespace Plasma
 {
@@ -475,6 +475,8 @@ QPixmap Animator::currentPixmap(int id)
         case DisappearAnimation:
             return d->driver->elementDisappear(progress, state->pixmap);
             break;
+        case ActivateAnimation:
+            break;
     }
 
     return state->pixmap;