diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt
index 06d9bf7e85..f78d96a5d8 100644
--- a/clients/oxygen/CMakeLists.txt
+++ b/clients/oxygen/CMakeLists.txt
@@ -1,23 +1,20 @@
 ########### next target ###############
 
-set(kwin_oxy_SRCS
+set(kwin_oxygen_SRCS
      lib/helper.cpp
      oxygenclient.cpp
      oxygenbutton.cpp
      oxygen.cpp
    )
 
+kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS})
 
-kde4_add_plugin(kwin3_oxy ${kwin_oxy_SRCS})
 
+target_link_libraries(kwin3_oxygen ${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB} kdecorations)
 
-target_link_libraries(kwin3_oxy ${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB} kdecorations)
-
-install(TARGETS kwin3_oxy  DESTINATION ${PLUGIN_INSTALL_DIR} )
-
+install(TARGETS kwin3_oxygen  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### install files ###############
 
 install( FILES oxygenclient.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
 
-
diff --git a/clients/oxygen/oxygenclient.desktop b/clients/oxygen/oxygenclient.desktop
index 66386dd8c2..4d64c54e94 100644
--- a/clients/oxygen/oxygenclient.desktop
+++ b/clients/oxygen/oxygenclient.desktop
@@ -11,4 +11,4 @@ Name[pa]=ਆਕਸੀਜਨ
 Name[sl]=Kisik
 Name[wa]=Ocsidjinne
 Name[x-test]=xxOxygenxx
-X-KDE-Library=kwin3_oxy
+X-KDE-Library=kwin3_oxygen
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index ea60883a02..8194dffef8 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -449,7 +449,7 @@ void KWinDecorationModule::readConfig( const KConfigGroup & conf )
 
 	oldLibraryName = currentLibraryName;
 	currentLibraryName = conf.readEntry("PluginLib",
-					((QPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz"));
+					((QPixmap::defaultDepth() > 8) ? "kwin_oxygen" : "kwin_plastik"));
 	QString decoName = decorationName( currentLibraryName );
 
 	// If we are using the "default" kde client, use the "default" entry.