diff --git a/core/chronoshare-common.hpp b/core/chronoshare-common.hpp
index 44b5873..56ee89c 100644
--- a/core/chronoshare-common.hpp
+++ b/core/chronoshare-common.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016, Regents of the University of California.
+ * Copyright (c) 2013-2017, Regents of the University of California.
  *
  * This file is part of ChronoShare, a decentralized file sharing application over NDN.
  *
@@ -18,8 +18,8 @@
  * See AUTHORS.md for complete list of ChronoShare authors and contributors.
  */
 
-#ifndef CHRONOSHARE_CORE_COMMON_HPP
-#define CHRONOSHARE_CORE_COMMON_HPP
+#ifndef CHRONOSHARE_CORE_CHRONOSHARE_COMMON_HPP
+#define CHRONOSHARE_CORE_CHRONOSHARE_COMMON_HPP
 
 #include "core/chronoshare-config.hpp"
 
@@ -46,7 +46,7 @@
 using std::shared_ptr;
 using std::make_shared;
 
-} // chronoshare
-} // ndn
+} // namespace chronoshare
+} // namespace ndn
 
-#endif // CHRONOSHARE_CORE_COMMON_HPP
+#endif // CHRONOSHARE_CORE_CHRONOSHARE_COMMON_HPP