diff --git a/common/schema.h b/common/schema.h
index d403e0dc..01c7c809 100644
--- a/common/schema.h
+++ b/common/schema.h
@@ -533,8 +533,8 @@ namespace swss {
 
 #define CFG_FABRIC_MONITOR_DATA_TABLE_NAME	"FABRIC_MONITOR"
 #define CFG_FABRIC_MONITOR_PORT_TABLE_NAME	"FABRIC_PORT"
-#define APP_FABRIC_MONITOR_DATA_TABLE_NAME	"FABRIC_MONITOR"
-#define APP_FABRIC_MONITOR_PORT_TABLE_NAME	"FABRIC_PORT"
+#define APP_FABRIC_MONITOR_DATA_TABLE_NAME	"FABRIC_MONITOR_TABLE"
+#define APP_FABRIC_MONITOR_PORT_TABLE_NAME	"FABRIC_PORT_TABLE"
 
 #ifdef __cplusplus
 }