diff --git a/model/sync-app-data-fetch.h b/model/sync-app-data-fetch.h
index 35a0b7c..c52d55b 100644
--- a/model/sync-app-data-fetch.h
+++ b/model/sync-app-data-fetch.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_LEAF_H
-#define SYNC_LEAF_H
+#ifndef SYNC_APP_DATA_FETCH_H
+#define SYNC_APP_DATA_FETCH_H
 #include "sync-ccnx-wrapper.h"
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
@@ -63,4 +63,4 @@
 
 } // Sync
 
-#endif // SYNC_LEAF_H
+#endif // SYNC_APP_DATA_FETCH_H
diff --git a/model/sync-app-data-publish.h b/model/sync-app-data-publish.h
index 162abf5..2031532 100644
--- a/model/sync-app-data-publish.h
+++ b/model/sync-app-data-publish.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STATE_H
-#define SYNC_STATE_H
+#ifndef SYNC_APP_DATA_PUBLISH_H
+#define SYNC_APP_DATA_PUBLISH_H
 #include <boost/shared_ptr.hpp>
 #include "sync-ccnx-wrapper.h"
 
@@ -79,4 +79,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_H
+#endif // SYNC_APP_DATA_PUBLISH_H
diff --git a/model/sync-app-socket.h b/model/sync-app-socket.h
index e4b6133..4c86f2d 100644
--- a/model/sync-app-socket.h
+++ b/model/sync-app-socket.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_LEAF_H
-#define SYNC_LEAF_H
+#ifndef SYNC_APP_SOCKET_H
+#define SYNC_APP_SOCKET_H
 #include <boost/function.hpp>
 
 namespace Sync {
@@ -67,4 +67,4 @@
 
 } // Sync
 
-#endif // SYNC_LEAF_H
+#endif // SYNC_APP_SOCKET_H
diff --git a/model/sync-app-wrapper.h b/model/sync-app-wrapper.h
index e9490e7..56f2c6e 100644
--- a/model/sync-app-wrapper.h
+++ b/model/sync-app-wrapper.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_LEAF_H
-#define SYNC_LEAF_H
+#ifndef SYNC_APP_WRAPPER_H
+#define SYNC_APP_WRAPPER_H
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include "sync-ccnx-wrapper.h"
@@ -81,4 +81,4 @@
 
 } // Sync
 
-#endif // SYNC_LEAF_H
+#endif // SYNC_APP_WRAPPER_H
diff --git a/model/sync-ccnx-wrapper.h b/model/sync-ccnx-wrapper.h
index b93f027..ad8ae9a 100644
--- a/model/sync-ccnx-wrapper.h
+++ b/model/sync-ccnx-wrapper.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STATE_H
-#define SYNC_STATE_H
+#ifndef SYNC_CCNX_WRAPPER_H
+#define SYNC_CCNX_WRAPPER_H
 
 extern "C" {
 #include <ccn/ccn.h>
@@ -111,4 +111,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_H
+#endif // SYNC_CCNX_WRAPPER_H
diff --git a/model/sync-data-buffer.h b/model/sync-data-buffer.h
index 09e15f4..2b2a1bf 100644
--- a/model/sync-data-buffer.h
+++ b/model/sync-data-buffer.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STATE_H
-#define SYNC_STATE_H
+#ifndef SYNC_DATA_BUFFER_H
+#define SYNC_DATA_BUFFER_H
 
 #include <tinyxml.h>
 #include <boost/shared_ptr.hpp>
@@ -125,4 +125,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_H
+#endif // SYNC_DATA_BUFFER_H
diff --git a/model/sync-interest-table.h b/model/sync-interest-table.h
index 609436d..1acac15 100644
--- a/model/sync-interest-table.h
+++ b/model/sync-interest-table.h
@@ -20,8 +20,8 @@
  *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#ifndef SYNC_STATE_H
-#define SYNC_STATE_H
+#ifndef SYNC_INTEREST_TABLE_H
+#define SYNC_INTEREST_TABLE_H
 #include <string>
 #include <boost/unordered_set.hpp>
 
@@ -55,4 +55,4 @@
 
 } // Sync
 
-#endif // SYNC_STATE_H
+#endif // SYNC_INTEREST_TABLE_H