Metaswitch
diff --git a/‎meta/saiattributelist.h
-13 b/‎meta/saiattributelist.h
-13
diff --git a/‎saiplayer/Makefile.am
+1-1 b/‎saiplayer/Makefile.am
+1-1
diff --git a/‎saiplayer/saiplayer.cpp renamed to ‎saiplayer/saiplayer_main.cpp b/‎saiplayer/saiplayer.cpp renamed to ‎saiplayer/saiplayer_main.cpp
diff --git a/‎syncd/Makefile.am
+1-1 b/‎syncd/Makefile.am
+1-1
diff --git a/‎syncd/syncd.cpp renamed to ‎syncd/syncd_main.cpp b/‎syncd/syncd.cpp renamed to ‎syncd/syncd_main.cpp
@@ -17,6 +17,6 @@ libSaiPlayer_a_SOURCES = \
 
 libSaiPlayer_a_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -std=c++14
 
-saiplayer_SOURCES = saiplayer.cpp
+saiplayer_SOURCES = saiplayer_main.cpp
 saiplayer_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -std=c++14
 saiplayer_LDADD = libSaiPlayer.a ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq
@@ -51,7 +51,7 @@ libSyncd_a_SOURCES = \
 				SaiObj.cpp \
 				SaiAttr.cpp \
 				VendorSai.cpp \
-				syncd.cpp \
+				syncd_main.cpp \
 				TimerWatchdog.cpp \
 				NotificationQueue.cpp \
 				CommandLineOptions.cpp \