diff --git a/src/gui/core/uievents.h b/src/gui/core/uievents.h
index 3ae1cb93..169f31fb 100755
--- a/src/gui/core/uievents.h
+++ b/src/gui/core/uievents.h
@@ -1,5 +1,5 @@
-#ifndef __NGL_UIEVENTS_H__
-#define __NGL_UIEVENTS_H__
+#ifndef __CDROID_UIEVENTS_H__
+#define __CDROID_UIEVENTS_H__
 #include <string>
 #include <core/eventcodes.h>
 #include <core/sparsearray.h>
diff --git a/src/gui/private/windowmanager.h b/src/gui/private/windowmanager.h
index 8bdd404d..989e3cf6 100755
--- a/src/gui/private/windowmanager.h
+++ b/src/gui/private/windowmanager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __NGLUI_WINDOWMANAGER_H__
-#define __NGLUI_WINDOWMANAGER_H__
+#ifndef __CDROID_WINDOWMANAGER_H__
+#define __CDROID_WINDOWMANAGER_H__
 
 #include <widget/view.h>
 #include <widget/window.h>
@@ -53,6 +53,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
-}  // namespace ui
+}  // namespace cdroid
 
-#endif  // __NGLUI_WINDOWMANAGER_H__
+#endif  // __CDROID WINDOWMANAGER_H__
diff --git a/src/gui/widget/edittext.h b/src/gui/widget/edittext.h
index 66dd39ee..c5d1263e 100755
--- a/src/gui/widget/edittext.h
+++ b/src/gui/widget/edittext.h
@@ -1,5 +1,5 @@
-#ifndef __NGLUI_EDITVIEW_H__
-#define __NGLUI_EDITVIEW_H__
+#ifndef __CDROID_EDITVIEW_H__
+#define __CDROID_EDITVIEW_H__
 #include <widget/textview.h>
 
 namespace cdroid{
@@ -49,7 +49,7 @@ public:
     virtual bool onKeyDown(int,KeyEvent&evt)override;
 };
 
-}//endof UI
+}//endof cdroid
 
 #endif
 
diff --git a/src/gui/widget/linearlayout.h b/src/gui/widget/linearlayout.h
index 8c24c915..3144e55b 100755
--- a/src/gui/widget/linearlayout.h
+++ b/src/gui/widget/linearlayout.h
@@ -109,5 +109,5 @@ public:
 };
 typedef LinearLayout::LayoutParams LinearLayoutParams;
 
-}  // namespace ui
+}  // namespace cdroid
 #endif 
diff --git a/src/gui/widget/textview.h b/src/gui/widget/textview.h
index 198d70f5..38eeff4e 100755
--- a/src/gui/widget/textview.h
+++ b/src/gui/widget/textview.h
@@ -214,6 +214,6 @@ public:
     void removeTextChangedListener(TextWatcher watcher);
 };
 
-}  // namespace ui
+}  // namespace cdroid
 
 #endif  //__TEXTVIEW_H__
diff --git a/src/gui/widget/view.h b/src/gui/widget/view.h
index a8de2885..a012a378 100755
--- a/src/gui/widget/view.h
+++ b/src/gui/widget/view.h
@@ -1,5 +1,5 @@
-#ifndef __NGL_VIEW_H__
-#define __NGL_VIEW_H__
+#ifndef __CDROID_VIEW_H__
+#define __CDROID_VIEW_H__
 #include <core/eventcodes.h>
 #include <core/uievents.h>
 #include <core/canvas.h>
diff --git a/src/gui/widget/viewgroup.h b/src/gui/widget/viewgroup.h
index 3f53ede0..7fe738d3 100755
--- a/src/gui/widget/viewgroup.h
+++ b/src/gui/widget/viewgroup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __NGLUI_GROUPVIEW_H__
-#define __NGLUI_GROUPVIEW_H__
+#ifndef __CDROID_GROUPVIEW_H__
+#define __CDROID_GROUPVIEW_H__
 
 #include <widget/view.h>
 #include <core/scroller.h>
@@ -328,6 +328,6 @@ public:
     virtual void cancelInvalidate(View* view);
 };
 
-}  // namespace ui
+}  // namespace cdroid
 
-#endif  // __NGLUI_GROUPVIEW_H__
+#endif  // __CDROID_GROUPVIEW_H__
diff --git a/src/gui/widget/window.cc b/src/gui/widget/window.cc
index 71f242bc..68c080e2 100755
--- a/src/gui/widget/window.cc
+++ b/src/gui/widget/window.cc
@@ -96,7 +96,6 @@ void Window::hide(){
 View& Window::setPos(int x,int y){
     ViewGroup::setPos(x,y);
     if( ((x!=mLeft) || (y!=mTop) ) && isAttachedToWindow()){
-        //WindowManager::getInstance().resetVisibleRegion();
         WindowManager::getInstance().moveWindow(this,x,y);
         mLeft=x;
         mTop=y;
diff --git a/src/gui/widget/window.h b/src/gui/widget/window.h
index ccd99c2f..9ee2ee33 100755
--- a/src/gui/widget/window.h
+++ b/src/gui/widget/window.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __NGLUI_WINDOW_H__
-#define __NGLUI_WINDOW_H__
+#ifndef __CDROID_WINDOW_H__
+#define __CDROID_WINDOW_H__
 #include <cdtypes.h>
 #include <widget/viewgroup.h>
 #include <widget/framelayout.h>
diff --git a/src/porting/include/cdgraph.h b/src/porting/include/cdgraph.h
index 8a71904d..3d2847ee 100755
--- a/src/porting/include/cdgraph.h
+++ b/src/porting/include/cdgraph.h
@@ -1,5 +1,5 @@
-#ifndef __NGL_GRAPH_H__
-#define __NGL_GRAPH_H__
+#ifndef __CDROID_GRAPH_H__
+#define __CDROID_GRAPH_H__
 #include <cdtypes.h>
 
 /**