diff --git a/composite.cpp b/composite.cpp
index 9b654c78c2..e7d9a8af07 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -328,7 +328,7 @@ void Workspace::toggleCompositing()
         if( !shortcut.isEmpty() && options->useCompositing )
             {
             // display notification only if there is the shortcut
-            message = i18n( "Compositing has been suspended by another application.<br/>"
+            message = i18n( "Desktop effects have been suspended by another application.<br/>"
                 "You can resume using the '%1' shortcut.", shortcut );
             Notify::raise( Notify::CompositingSuspendedDbus, message );
             }
@@ -582,12 +582,12 @@ void Workspace::checkCompositePaintTime( int msec )
         if( KAction* action = qobject_cast<KAction*>( keys->action("Suspend Compositing")))
             shortcut = action->globalShortcut().primary().toString(QKeySequence::NativeText);
         if (shortcut.isEmpty())
-            message = i18n( "Compositing was too slow and has been suspended.\n"
-                "You can disable functionality checks in advanced compositing settings." );
+            message = i18n( "Desktop effects were too slow and have been suspended.\n"
+                "You can disable functionality checks in System Settings (on the Advanced tab in Desktop Effects)." );
         else
-            message = i18n( "Compositing was too slow and has been suspended.\n"
+            message = i18n( "Desktop effects were too slow and have been suspended.\n"
                 "If this was only a temporary problem, you can resume using the '%1' shortcut.\n"
-                "You can also disable functionality checks in advanced compositing settings.", shortcut );
+                "You can disable functionality checks in System Settings (on the Advanced tab in Desktop Effects).", shortcut );
         Notify::raise( Notify::CompositingSlow, message );
         compositeTimer.start( 1000 ); // so that it doesn't trigger sooner than suspendCompositing()
         }
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index 6411a96c05..ad0950493b 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -159,7 +159,7 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList
         ui.useCompositing->setChecked(false);
         compositingEnabled(false);
 
-        QString text = i18n("Compositing is not supported on your system.");
+        QString text = i18n("Desktop effects are not available on this system due to the following technical issues:");
         text += "<br>";
         text += CompositingPrefs::compositingNotPossibleReason();
         ui.statusTitleWidget->setText(text);
@@ -388,22 +388,22 @@ void KWinCompositingConfig::setupCompositingState( bool active, bool enabled )
         if( active )
             {
             stateIcon = QString( "dialog-ok-apply" );
-            stateText = i18n( "Compositing is active" );
-            stateButtonText = i18n( "Suspend Compositing" );
+            stateText = i18n( "Desktop effects are active" );
+            stateButtonText = i18n( "Suspend Desktop Effects" );
             }
         else
             {
             stateIcon = QString( "dialog-cancel" );
-            stateText = i18n( "Compositing is temporarily disabled" );
-            stateButtonText = i18n( "Resume Compositing" );
+            stateText = i18n( "Desktop effects are temporarily disabled" );
+            stateButtonText = i18n( "Resume Desktop Effects" );
             }
         }
     else
         {
         // compositing is disabled
         stateIcon = QString( "dialog-cancel" );
-        stateText = i18n( "Compositing is disabled" );
-        stateButtonText = i18n( "Resume Compositing" );
+        stateText = i18n( "Desktop effects are disabled" );
+        stateButtonText = i18n( "Resume Desktop Effects" );
         }
     const int iconSize = (QApplication::fontMetrics().height() > 24) ? 32 : 22;
     ui.compositingStateIcon->setPixmap( KIcon( stateIcon ).pixmap( iconSize, iconSize ) );
@@ -699,7 +699,7 @@ void KWinCompositingConfig::checkLoadedEffects()
             {
             KServiceTypeTrader* trader = KServiceTypeTrader::self();
             KService::List services;
-            QString message = i18n( "The following effects could not be activated:" );
+            QString message = i18n( "The following desktop effects could not be activated:" );
             message.append( "<ul>" );
             foreach( const QString &effect, disabledEffects )
                 {