diff --git a/common/notificationconsumer.h b/common/notificationconsumer.h
index 497b3eccd..93e5eccce 100644
--- a/common/notificationconsumer.h
+++ b/common/notificationconsumer.h
@@ -10,7 +10,6 @@
 #include "json.h"
 #include "logger.h"
 #include "redisreply.h"
-#include "scheme.h"
 #include "selectable.h"
 #include "table.h"
 
diff --git a/common/notificationproducer.h b/common/notificationproducer.h
index f649d2e59..1f7b89148 100644
--- a/common/notificationproducer.h
+++ b/common/notificationproducer.h
@@ -6,7 +6,6 @@
 
 #include <hiredis/hiredis.h>
 #include "dbconnector.h"
-#include "scheme.h"
 #include "logger.h"
 #include "table.h"
 #include "redisreply.h"
diff --git a/common/producertable.h b/common/producertable.h
index 7f7a870ce..556737430 100644
--- a/common/producertable.h
+++ b/common/producertable.h
@@ -7,7 +7,6 @@
 #include <hiredis/hiredis.h>
 #include "dbconnector.h"
 #include "table.h"
-#include "scheme.h"
 
 namespace swss {
 
diff --git a/common/scheme.h b/common/schema.h
similarity index 97%
rename from common/scheme.h
rename to common/schema.h
index a3dfab432..c4e2a00fe 100644
--- a/common/scheme.h
+++ b/common/schema.h
@@ -1,5 +1,5 @@
-#ifndef __SCHEME__
-#define __SCHEME__
+#ifndef __SCHEMA__
+#define __SCHEMA__
 
 namespace swss {
 
diff --git a/common/table.h b/common/table.h
index 11f880f13..96b187142 100644
--- a/common/table.h
+++ b/common/table.h
@@ -7,7 +7,7 @@
 #include "hiredis/hiredis.h"
 #include "dbconnector.h"
 #include "redisreply.h"
-#include "scheme.h"
+#include "schema.h"
 
 namespace swss {