diff --git a/clients/ozone/config/CMakeLists.txt b/clients/ozone/config/CMakeLists.txt
index f492d2f4c6..ca00daf20a 100644
--- a/clients/ozone/config/CMakeLists.txt
+++ b/clients/ozone/config/CMakeLists.txt
@@ -3,16 +3,16 @@ include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib  )
 
 ########### next target ###############
 
-set(kwin_oxygen_config_PART_SRCS config.cpp )
+set(kwin_ozone_config_PART_SRCS config.cpp )
 
 
-kde4_add_ui_files(kwin_oxygen_config_PART_SRCS oxygenconfig.ui )
+kde4_add_ui_files(kwin_ozone_config_PART_SRCS oxygenconfig.ui )
 
-kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS})
+kde4_add_plugin(kwin_ozone_config ${kwin_ozone_config_PART_SRCS})
 
 
 
-target_link_libraries(kwin_oxygen_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
+target_link_libraries(kwin_ozone_config  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
 
-install(TARGETS kwin_oxygen_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kwin_ozone_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff --git a/clients/ozone/config/config.cpp b/clients/ozone/config/config.cpp
index c696dc0205..76ba916191 100644
--- a/clients/ozone/config/config.cpp
+++ b/clients/ozone/config/config.cpp
@@ -35,10 +35,11 @@ extern "C"
 {
     KDE_EXPORT QObject* allocate_config( KConfig* conf, QWidget* parent )
     {
-        return ( new Oxygen::OxygenConfig( conf, parent ) );
+        return ( new Ozone::Oxygen::OxygenConfig( conf, parent ) );
     }
 }
 
+namespace Ozone {
 namespace Oxygen {
 
 OxygenConfig::OxygenConfig( KConfig*, QWidget* parent )
@@ -89,3 +90,4 @@ void OxygenConfig::defaults()
 }
 
 } //namespace Oxygen
+} //namespace Ozone
diff --git a/clients/ozone/config/config.h b/clients/ozone/config/config.h
index 467a918b16..8d5ee166a0 100644
--- a/clients/ozone/config/config.h
+++ b/clients/ozone/config/config.h
@@ -29,6 +29,7 @@
 
 #include "ui_oxygenconfig.h"
 
+namespace Ozone {
 namespace Oxygen {
 
 class OxygenConfigUI : public QWidget, public Ui::OxygenConfigUI
@@ -60,5 +61,6 @@ private:
 };
 
 } //namespace Oxygen
+} //namespace Ozone
 
 #endif
diff --git a/clients/ozone/config/oxygenconfig.ui b/clients/ozone/config/oxygenconfig.ui
index 471adb366a..5e94fbfeae 100644
--- a/clients/ozone/config/oxygenconfig.ui
+++ b/clients/ozone/config/oxygenconfig.ui
@@ -1,5 +1,5 @@
 <ui version="4.0" >
- <class>OxygenConfigUI</class>
+ <class>Ozone::OxygenConfigUI</class>
  <widget class="QWidget" name="OxygenConfigUI" >
   <property name="geometry" >
    <rect>