diff --git a/src/controller.hpp b/src/controller.hpp
index 44e4801..1c6ef43 100644
--- a/src/controller.hpp
+++ b/src/controller.hpp
@@ -8,8 +8,8 @@
  * Author: Yingdi Yu <yingdi@cs.ucla.edu>
  */
 
-#ifndef CHRONOS_CONTROLLER_HPP
-#define CHRONOS_CONTROLLER_HPP
+#ifndef CHRONOCHAT_CONTROLLER_HPP
+#define CHRONOCHAT_CONTROLLER_HPP
 
 #include <QDialog>
 #include <QMenu>
@@ -31,7 +31,7 @@
 #include "controller-backend.hpp"
 #endif
 
-namespace chronos {
+namespace chronochat {
 
 class Controller : public QDialog
 {
@@ -75,7 +75,7 @@
   addChatDialog(const QString& chatroomName, ChatDialog* chatDialog);
 
   void
-  updateDiscoveryList(const chronos::ChatroomInfo& chatroomName, bool isAdd);
+  updateDiscoveryList(const chronochat::ChatroomInfo& chatroomName, bool isAdd);
 
 signals:
   void
@@ -104,7 +104,7 @@
                      size_t routingPrefixOffset);
 
   void
-  discoverChatroomChanged(const chronos::ChatroomInfo& chatroomInfo, bool isAdd);
+  discoverChatroomChanged(const chronochat::ChatroomInfo& chatroomInfo, bool isAdd);
 
   void
   addChatroom(QString chatroomName);
@@ -159,7 +159,7 @@
   onStartChatroom(const QString& chatroom, bool secured);
 
   void
-  onStartChatroom2(chronos::Invitation invitation, bool secured);
+  onStartChatroom2(chronochat::Invitation invitation, bool secured);
 
   void
   onShowChatMessage(const QString& chatroomName, const QString& from, const QString& data);
@@ -177,7 +177,7 @@
   onError(const QString& msg);
 
   void
-  onRosterChanged(const chronos::ChatroomInfo& info);
+  onRosterChanged(const chronochat::ChatroomInfo& info);
 
 private: // private member
   typedef std::map<std::string, QAction*> ChatActionList;
@@ -222,6 +222,6 @@
   ControllerBackend m_backend;
 };
 
-} // namespace chronos
+} // namespace chronochat
 
-#endif //CHRONOS_CONTROLLER_HPP
+#endif // CHRONOCHAT_CONTROLLER_HPP