diff --git a/dbcon/dmlpackageproc/commandpackageprocessor.cpp b/dbcon/dmlpackageproc/commandpackageprocessor.cpp
index 6e30355c4..b1a65cc2f 100644
--- a/dbcon/dmlpackageproc/commandpackageprocessor.cpp
+++ b/dbcon/dmlpackageproc/commandpackageprocessor.cpp
@@ -35,8 +35,8 @@
 #include "we_messages.h"
 #include "we_ddlcommandclient.h"
 #include "oamcache.h"
-#include "snmpglobal.h"
-#include "snmpmanager.h"
+#include "alarmglobal.h"
+#include "alarmmanager.h"
 #include "liboamcpp.h"
 using namespace std;
 using namespace WriteEngine;
diff --git a/dbcon/joblist/distributedenginecomm.cpp b/dbcon/joblist/distributedenginecomm.cpp
index 8126a050f..73f1bfad7 100644
--- a/dbcon/joblist/distributedenginecomm.cpp
+++ b/dbcon/joblist/distributedenginecomm.cpp
@@ -58,8 +58,8 @@ using namespace config;
 using namespace logging;
 
 #include "liboamcpp.h"
-#include "snmpmanager.h"
-using namespace snmpmanager;
+#include "alarmmanager.h"
+using namespace alarmmanager;
 using namespace oam;
 
 #include "jobstep.h"
@@ -371,7 +371,7 @@ Error:
 		//cout << "PMCOUNT=" << pmCount << endl;
 
 		// send alarm & log it
-		SNMPManager alarmMgr;
+		ALARMManager alarmMgr;
 		string alarmItem = client->addr2String();
 		alarmItem.append(" PrimProc");
 		alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::CONN_FAILURE, SET);
@@ -895,7 +895,7 @@ int DistributedEngineComm::writeToClient(size_t index, const ByteStream& bs, uin
 		}
 
 		// send alarm
-		SNMPManager alarmMgr;
+		ALARMManager alarmMgr;
 		string alarmItem("UNKNOWN");
 		if (index < fPmConnections.size())
 		{
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index accb35d3c..fe542e3a4 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -31,8 +31,8 @@
 #include "boost/progress.hpp"
 using namespace std;
 
-#include "snmpglobal.h"
-#include "snmpmanager.h"
+#include "alarmglobal.h"
+#include "alarmmanager.h"
 #include "liboamcpp.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -132,8 +132,8 @@ void rollbackAll(DBRM* dbrm)
 {
     Oam oam;
 	try {
-		snmpmanager::SNMPManager alarmMgr; 
-		alarmMgr.sendAlarmReport("System", oam::ROLLBACK_FAILURE, snmpmanager::CLEAR); 
+		alarmmanager::ALARMManager alarmMgr; 
+		alarmMgr.sendAlarmReport("System", oam::ROLLBACK_FAILURE, alarmmanager::CLEAR); 
 	}
 	catch (...)
 	{}
@@ -270,8 +270,8 @@ void rollbackAll(DBRM* dbrm)
 				rc = dbrm->setReadOnly(true);
 				//Raise an alarm
 				try { 
-                    snmpmanager::SNMPManager alarmMgr; 
-                    alarmMgr.sendAlarmReport("System", oam::ROLLBACK_FAILURE, snmpmanager::SET); 
+                    alarmmanager::ALARMManager alarmMgr; 
+                    alarmMgr.sendAlarmReport("System", oam::ROLLBACK_FAILURE, alarmmanager::SET); 
                 }
                 catch (...)
                 {}
@@ -396,8 +396,8 @@ void rollbackAll(DBRM* dbrm)
 				rc = dbrm->setReadOnly(true);
 				//Raise an alarm
 				try { 
-                    snmpmanager::SNMPManager alarmMgr; 
-                    alarmMgr.sendAlarmReport("System", oam::ROLLBACK_FAILURE, snmpmanager::SET); 
+                    alarmmanager::ALARMManager alarmMgr; 
+                    alarmMgr.sendAlarmReport("System", oam::ROLLBACK_FAILURE, alarmmanager::SET); 
                 }
                 catch (...)
                 {}
diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt
index c697863c6..10f98a7cc 100644
--- a/oam/oamcpp/CMakeLists.txt
+++ b/oam/oamcpp/CMakeLists.txt
@@ -8,7 +8,7 @@ set(oamcpp_LIB_SRCS liboamcpp.cpp oamcache.cpp)
 
 add_library(oamcpp SHARED ${oamcpp_LIB_SRCS})
 
-target_link_libraries(oamcpp ${NETSNMP_LIBRARIES})
+target_link_libraries(oamcpp )
 
 set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 9718b631c..b06d5945f 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -72,7 +72,7 @@ static const std::string optim("Build is "
 
 namespace fs = boost::filesystem;
 
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace config;
 using namespace std;
 using namespace messageqcpp;
@@ -2592,7 +2592,7 @@ namespace oam
 
             if (OAMParentModuleFlag) {
                 //call getAlarm API directly
-                SNMPManager sm;
+                ALARMManager sm;
                 sm.getActiveAlarm(activeAlarm);
                 return;
             }
@@ -2634,7 +2634,7 @@ namespace oam
 
             if (OAMParentModuleFlag) {
                 //call getAlarm API directly
-                SNMPManager sm;
+                ALARMManager sm;
                 sm.getAlarm(date, alarmlist);
                 return;
             }
@@ -2669,7 +2669,7 @@ namespace oam
 
             if (OAMParentModuleFlag) {
                 //call getAlarm API directly
-                SNMPManager sm;
+                ALARMManager sm;
                 sm.getActiveAlarm(activeAlarm);
             }
             else if (UseHdfs > 0)
diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index 883123aa4..29b9ec9e1 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -42,7 +42,7 @@
 #include "bytestream.h"
 #include "configcpp.h"
 #include "boost/tuple/tuple.hpp"
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 #include "dbrm.h"
 
 #include "messagequeue.h"
@@ -556,7 +556,6 @@ namespace oam
 	GETDBRMDATA,
 	GETPARENTOAMMODULE,
 	OAMPARENTCOLD,
-	UPDATESNMPD,
 	GETALARMDATA,
 	GETACTIVEALARMDATA,
 	RUNUPGRADE,
@@ -1922,7 +1921,7 @@ namespace oam
              * Get's the Active Alarm list for the Calpont Database Appliance
              * @param activealarm Returned Active Alarm list Structure
              */
-            EXPORT void getActiveAlarms(snmpmanager::AlarmList& activealarm);
+            EXPORT void getActiveAlarms(alarmmanager::AlarmList& activealarm);
 
             /** @brief Get Historical Alarms
              *
@@ -1930,7 +1929,7 @@ namespace oam
 			 * @param date date of alarms, "today" or date in YYYYMMDD
              * @param activealarm Returned Alarm list Structure
              */
-            EXPORT void getAlarms(std::string date, snmpmanager::AlarmList& alarm);
+            EXPORT void getAlarms(std::string date, alarmmanager::AlarmList& alarm);
 
             /** @brief check Active Alarm
              *
@@ -1946,7 +1945,7 @@ namespace oam
              * Read the Active Alarm list from the HDFS image of activeAlarms
              * @param activealarm Returned Active Alarm list Structure
              */
-            EXPORT int readHdfsActiveAlarms(snmpmanager::AlarmList& activealarm);
+            EXPORT int readHdfsActiveAlarms(alarmmanager::AlarmList& activealarm);
 
             /** @brief update Log
              *
@@ -2453,7 +2452,7 @@ namespace oam
 
     private:
 
-	    int sendMsgToProcMgr3(messageqcpp::ByteStream::byte requestType, snmpmanager::AlarmList& alarmlist, const std::string date);
+	    int sendMsgToProcMgr3(messageqcpp::ByteStream::byte requestType, alarmmanager::AlarmList& alarmlist, const std::string date);
 
             /** @brief build and send request message to Process Manager
              */
diff --git a/oam/oamcpp/tdriver.cpp b/oam/oamcpp/tdriver.cpp
index b64b1a963..67de80420 100644
--- a/oam/oamcpp/tdriver.cpp
+++ b/oam/oamcpp/tdriver.cpp
@@ -41,7 +41,7 @@ using namespace boost;
 #include "liboamcpp.h"
 using namespace oam;
 
-using namespace snmpmanager;
+using namespace alarmmanager;
 
 class getModuleInfoTest : public CppUnit::TestFixture {
 
diff --git a/oamapps/alarmmanager/tdriver.cpp b/oamapps/alarmmanager/tdriver.cpp
index 012039580..8835e7f5c 100644
--- a/oamapps/alarmmanager/tdriver.cpp
+++ b/oamapps/alarmmanager/tdriver.cpp
@@ -26,9 +26,9 @@ using namespace oam;
 using namespace messageqcpp;
 using namespace std;
 
-class SNMPManagerTest : public CppUnit::TestFixture {
+class ALARMManagerTest : public CppUnit::TestFixture {
 
-CPPUNIT_TEST_SUITE( SNMPManagerTest );
+CPPUNIT_TEST_SUITE( ALARMManagerTest );
 
 CPPUNIT_TEST( test1 );
 CPPUNIT_TEST( test2 );
@@ -48,7 +48,7 @@ public:
 
 	void test1() {
 		// set alarm
-		SNMPManager sm;
+		ALARMManager sm;
 		sm.sendAlarmReport("EC-DISK-1", 4, SET);
 		AlarmList activeAlarms;
 		sm.getActiveAlarm(activeAlarms);
@@ -86,7 +86,7 @@ public:
 	
 	void test3()
 	{
-		SNMPManager sm;
+		ALARMManager sm;
 		string value;
 		sm.setSNMPConfig ("atlanta", SUB_AGENT, "DISK_CRITICAL", "2000000");
 		sm.getSNMPConfig ("atlanta", SUB_AGENT, "DISK_CRITICAL", value);
@@ -104,14 +104,14 @@ public:
 
 	void test4() {
 		// set Server name in snmpdx.conf
-		SNMPManager sm;
+		ALARMManager sm;
 		sm.setSNMPModuleName();
 	}
 
 
 }; 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( SNMPManagerTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( ALARMManagerTest );
 
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
diff --git a/oamapps/calpontConsole/calpontConsole.cpp b/oamapps/calpontConsole/calpontConsole.cpp
index 467420c7f..74c8e633a 100644
--- a/oamapps/calpontConsole/calpontConsole.cpp
+++ b/oamapps/calpontConsole/calpontConsole.cpp
@@ -33,7 +33,7 @@ extern int h_errno;
 #include "dbrm.h"
 namespace fs = boost::filesystem;
 
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace std;
 using namespace oam;
 using namespace config;
@@ -2852,7 +2852,7 @@ int processCommand(string* arguments)
 						}
 					}
 
-	                SNMPManager aManager;
+	                ALARMManager aManager;
 					aManager.sendAlarmReport((i->second).getComponentID().c_str(),
 												(i->second).getAlarmID(),
 												CLEAR,
diff --git a/oamapps/calpontConsole/calpontConsole.h b/oamapps/calpontConsole/calpontConsole.h
index 8ea337156..181fd3d69 100644
--- a/oamapps/calpontConsole/calpontConsole.h
+++ b/oamapps/calpontConsole/calpontConsole.h
@@ -46,8 +46,8 @@
 
 #include "liboamcpp.h"
 #include "configcpp.h"
-#include "snmpmanager.h"
-#include "snmpglobal.h"
+#include "alarmmanager.h"
+#include "alarmglobal.h"
 #include "calpontsystemcatalog.h"
 #include "brmtypes.h"
 
diff --git a/oamapps/columnstoreDB/CMakeLists.txt b/oamapps/columnstoreDB/CMakeLists.txt
index 9f6942a81..016f705c1 100644
--- a/oamapps/columnstoreDB/CMakeLists.txt
+++ b/oamapps/columnstoreDB/CMakeLists.txt
@@ -8,7 +8,7 @@ set(columnstoreDBWrite_SRCS columnstoreDB.cpp)
 
 add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS})
 
-target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt
index 74a79a809..c9732e03a 100644
--- a/oamapps/columnstoreSupport/CMakeLists.txt
+++ b/oamapps/columnstoreSupport/CMakeLists.txt
@@ -8,7 +8,7 @@ set(columnstoreSupport_SRCS columnstoreSupport.cpp)
 
 add_executable(columnstoreSupport ${columnstoreSupport_SRCS})
 
-target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/oamapps/hardwareMonitor/hardwareMonitor.cpp b/oamapps/hardwareMonitor/hardwareMonitor.cpp
index cb36ec13a..28e16397b 100644
--- a/oamapps/hardwareMonitor/hardwareMonitor.cpp
+++ b/oamapps/hardwareMonitor/hardwareMonitor.cpp
@@ -25,7 +25,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 
 
@@ -216,7 +216,7 @@ void sendAlarm(string alarmItem, ALARMS alarmID, int action, float sensorValue)
 	// check if Alarm is already active, don't resend
 	if ( !( oam.checkActiveAlarm(alarmID, serverName, alarmItem)) ) {
 
-		SNMPManager alarmMgr;
+		ALARMManager alarmMgr;
 		// send alarm
 		alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, action);
 
@@ -291,7 +291,7 @@ void checkAlarm(string alarmItem, ALARMS alarmID)
 ******************************************************************************************/
 void clearAlarm(string alarmItem, ALARMS alarmID)
 {
-	SNMPManager alarmMgr;
+	ALARMManager alarmMgr;
 	alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, CLEAR);
 
 	//Log this event 
diff --git a/oamapps/hardwareMonitor/hardwareMonitor.h b/oamapps/hardwareMonitor/hardwareMonitor.h
index 54d973df1..2fc395d04 100644
--- a/oamapps/hardwareMonitor/hardwareMonitor.h
+++ b/oamapps/hardwareMonitor/hardwareMonitor.h
@@ -38,7 +38,7 @@
 #include "messagelog.h"
 #include "messageobj.h"
 #include "loggingid.h"
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 
 
 int IPMI_SUPPORT = 0;	// 0 for supported
diff --git a/oamapps/mcsadmin/CMakeLists.txt b/oamapps/mcsadmin/CMakeLists.txt
index 9351e68e5..5d06594df 100644
--- a/oamapps/mcsadmin/CMakeLists.txt
+++ b/oamapps/mcsadmin/CMakeLists.txt
@@ -8,7 +8,7 @@ set(mcsadmin_SRCS mcsadmin.cpp)
 
 add_executable(mcsadmin ${mcsadmin_SRCS})
 
-target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 910d0367e..50af96f0b 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -34,7 +34,7 @@ extern int h_errno;
 #include "dbrm.h"
 namespace fs = boost::filesystem;
 
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace std;
 using namespace oam;
 using namespace config;
@@ -2708,7 +2708,7 @@ int processCommand(string* arguments)
             cout << endl << "Monitor for System Alarms" << endl;
             cout << " Enter control-C to return to command line" << endl << endl;
 
-            cmd = "tail -n 0 -f " + snmpmanager::ALARM_FILE;
+            cmd = "tail -n 0 -f " + alarmmanager::ALARM_FILE;
             system(cmd.c_str());
         }
         break;
@@ -2755,7 +2755,7 @@ int processCommand(string* arguments)
 						}
 					}
 
-	                SNMPManager aManager;
+	                ALARMManager aManager;
 					aManager.sendAlarmReport((i->second).getComponentID().c_str(),
 												(i->second).getAlarmID(),
 												CLEAR,
diff --git a/oamapps/mcsadmin/mcsadmin.h b/oamapps/mcsadmin/mcsadmin.h
index daf2b05e7..627f8c774 100644
--- a/oamapps/mcsadmin/mcsadmin.h
+++ b/oamapps/mcsadmin/mcsadmin.h
@@ -47,8 +47,8 @@
 
 #include "liboamcpp.h"
 #include "configcpp.h"
-#include "snmpmanager.h"
-#include "snmpglobal.h"
+#include "alarmmanager.h"
+#include "alarmglobal.h"
 #include "calpontsystemcatalog.h"
 #include "brmtypes.h"
 
diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt
index 9881a4d1b..334c0b46a 100644
--- a/oamapps/postConfigure/CMakeLists.txt
+++ b/oamapps/postConfigure/CMakeLists.txt
@@ -8,7 +8,7 @@ set(postConfigure_SRCS postConfigure.cpp helpers.cpp)
 
 add_executable(postConfigure ${postConfigure_SRCS})
 
-target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
@@ -19,7 +19,7 @@ set(installer_SRCS installer.cpp helpers.cpp)
 
 add_executable(installer ${installer_SRCS})
 
-target_link_libraries(installer ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(installer ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
@@ -30,7 +30,7 @@ set(getMySQLpw_SRCS getMySQLpw.cpp)
 
 add_executable(getMySQLpw ${getMySQLpw_SRCS})
 
-target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
@@ -52,7 +52,7 @@ set(mycnfUpgrade_SRCS mycnfUpgrade.cpp)
 
 add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS})
 
-target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${NETSNMP_LIBRARIES} ${ENGINE_EXEC_LIBS})
+target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses  ${ENGINE_EXEC_LIBS})
 
 install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
 
diff --git a/oamapps/postConfigure/amazonInstaller.cpp b/oamapps/postConfigure/amazonInstaller.cpp
index a40069759..9268d0f28 100644
--- a/oamapps/postConfigure/amazonInstaller.cpp
+++ b/oamapps/postConfigure/amazonInstaller.cpp
@@ -48,12 +48,12 @@
 
 #include "liboamcpp.h"
 #include "configcpp.h"
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 
 using namespace std;
 using namespace oam;
 using namespace config;
-using namespace snmpmanager;
+using namespace alarmmanager;
 
 #include "helpers.h"
 using namespace installer;
diff --git a/oamapps/postConfigure/patchInstaller.cpp b/oamapps/postConfigure/patchInstaller.cpp
index 757d89a31..8c71342f8 100644
--- a/oamapps/postConfigure/patchInstaller.cpp
+++ b/oamapps/postConfigure/patchInstaller.cpp
@@ -46,7 +46,7 @@
 
 #include "liboamcpp.h"
 #include "configcpp.h"
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 
 using namespace std;
 using namespace oam;
diff --git a/oamapps/resourceMonitor/hardwareMonitor.cpp b/oamapps/resourceMonitor/hardwareMonitor.cpp
index 542d6adc7..1ae1d7580 100644
--- a/oamapps/resourceMonitor/hardwareMonitor.cpp
+++ b/oamapps/resourceMonitor/hardwareMonitor.cpp
@@ -32,11 +32,11 @@
 #include "messagelog.h"
 #include "messageobj.h"
 #include "loggingid.h"
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 
 /**
@@ -174,7 +174,7 @@ int main (int argc, char** argv)
 void sendAlarm(string alarmItem, ALARMS alarmID, int action)
 {
 	Oam oam;
-	SNMPManager alarmMgr;
+	ALARMManager alarmMgr;
 	// send alarm
 	alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, action);
 
diff --git a/oamapps/sendtrap/sendtrap.cpp b/oamapps/sendtrap/sendtrap.cpp
index 8461cbb81..4b9720273 100644
--- a/oamapps/sendtrap/sendtrap.cpp
+++ b/oamapps/sendtrap/sendtrap.cpp
@@ -20,7 +20,7 @@
 * Author: Zhixuan Zhu
 ******************************************************************************************/
 #define SNMPMANAGER_DLLEXPORT
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 #undef SNMPMANAGER_DLLEXPORT
 
 #include <cstdio>
@@ -29,14 +29,14 @@
 #include <iterator>
 
 #include "messagequeue.h"
-#include "snmpglobal.h"
+#include "alarmglobal.h"
 #include "liboamcpp.h"
 
 using namespace std;
 using namespace oam;
 using namespace messageqcpp;
 using namespace logging;
-using namespace snmpmanager;
+using namespace alarmmanager;
 
 
 /******************************************************************************************
diff --git a/oamapps/serverMonitor/UMAutoSync.cpp b/oamapps/serverMonitor/UMAutoSync.cpp
index 784863134..5ae97f9e4 100644
--- a/oamapps/serverMonitor/UMAutoSync.cpp
+++ b/oamapps/serverMonitor/UMAutoSync.cpp
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 using namespace config;
diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp
index 43329b1ed..f469abac4 100644
--- a/oamapps/serverMonitor/cpuMonitor.cpp
+++ b/oamapps/serverMonitor/cpuMonitor.cpp
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 //using namespace procheartbeat;
diff --git a/oamapps/serverMonitor/dbhealthMonitor.cpp b/oamapps/serverMonitor/dbhealthMonitor.cpp
index e6d4a77a9..21950620c 100644
--- a/oamapps/serverMonitor/dbhealthMonitor.cpp
+++ b/oamapps/serverMonitor/dbhealthMonitor.cpp
@@ -27,7 +27,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 using namespace config;
diff --git a/oamapps/serverMonitor/diskMonitor.cpp b/oamapps/serverMonitor/diskMonitor.cpp
index 0fc506297..8264c82e3 100644
--- a/oamapps/serverMonitor/diskMonitor.cpp
+++ b/oamapps/serverMonitor/diskMonitor.cpp
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 using namespace config;
diff --git a/oamapps/serverMonitor/hardwareMonitor.cpp b/oamapps/serverMonitor/hardwareMonitor.cpp
index 048506a5a..1b4bb1b0b 100644
--- a/oamapps/serverMonitor/hardwareMonitor.cpp
+++ b/oamapps/serverMonitor/hardwareMonitor.cpp
@@ -25,7 +25,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 //using namespace procheartbeat;
diff --git a/oamapps/serverMonitor/memoryMonitor.cpp b/oamapps/serverMonitor/memoryMonitor.cpp
index 716308e7d..9c9988558 100644
--- a/oamapps/serverMonitor/memoryMonitor.cpp
+++ b/oamapps/serverMonitor/memoryMonitor.cpp
@@ -27,7 +27,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 //using namespace procheartbeat;
diff --git a/oamapps/serverMonitor/procmonMonitor.cpp b/oamapps/serverMonitor/procmonMonitor.cpp
index 0ae09fb55..a378eaae5 100644
--- a/oamapps/serverMonitor/procmonMonitor.cpp
+++ b/oamapps/serverMonitor/procmonMonitor.cpp
@@ -25,7 +25,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 using namespace messageqcpp;
diff --git a/oamapps/serverMonitor/serverMonitor.cpp b/oamapps/serverMonitor/serverMonitor.cpp
index 2b75536b6..27272c48a 100644
--- a/oamapps/serverMonitor/serverMonitor.cpp
+++ b/oamapps/serverMonitor/serverMonitor.cpp
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace servermonitor;
 
@@ -91,7 +91,7 @@ void ServerMonitor::sendAlarm(string alarmItem, ALARMS alarmID, int action, floa
 	// check if Alarm is already active, don't resend
 	if ( !( oam.checkActiveAlarm(alarmID, moduleName, alarmItem)) ) {
 
-		SNMPManager alarmMgr;
+		ALARMManager alarmMgr;
 		// send alarm
 		alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, action);
 
@@ -166,7 +166,7 @@ void ServerMonitor::checkAlarm(string alarmItem, ALARMS alarmID)
 ******************************************************************************************/
 void ServerMonitor::clearAlarm(string alarmItem, ALARMS alarmID)
 {
-	SNMPManager alarmMgr;
+	ALARMManager alarmMgr;
 	alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, CLEAR);
 
 	//Log this event 
@@ -298,7 +298,7 @@ bool ServerMonitor::sendResourceAlarm(string alarmItem, ALARMS alarmID, int acti
 		// check if Alarm is already active from any module, don't resend
 		if ( !( oam.checkActiveAlarm(alarmID, "*", alarmItem)) ) {
 	
-			SNMPManager alarmMgr;
+			ALARMManager alarmMgr;
 			// send alarm
 			alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, action);
 	
@@ -316,7 +316,7 @@ bool ServerMonitor::sendResourceAlarm(string alarmItem, ALARMS alarmID, int acti
 		// check if Alarm is already active from this module, don't resend
 		if ( !( oam.checkActiveAlarm(alarmID, moduleName, alarmItem)) ) {
 	
-			SNMPManager alarmMgr;
+			ALARMManager alarmMgr;
 			// send alarm
 			alarmMgr.sendAlarmReport(alarmItem.c_str(), alarmID, action);
 	
diff --git a/oamapps/serverMonitor/serverMonitor.h b/oamapps/serverMonitor/serverMonitor.h
index fb3c0dbef..2637ae41a 100644
--- a/oamapps/serverMonitor/serverMonitor.h
+++ b/oamapps/serverMonitor/serverMonitor.h
@@ -47,10 +47,10 @@
 #include "messagelog.h"
 #include "messageobj.h"
 #include "loggingid.h"
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 #include "socketclosed.h"
 #include "shmkeys.h"
-#include "snmpglobal.h"
+#include "alarmglobal.h"
 #
 
 
diff --git a/oamapps/traphandler/trapHandler.cpp b/oamapps/traphandler/trapHandler.cpp
index b66f246ea..7a63058f5 100644
--- a/oamapps/traphandler/trapHandler.cpp
+++ b/oamapps/traphandler/trapHandler.cpp
@@ -12,9 +12,9 @@
 #include <stdexcept>
 using namespace std;
 
-#include "snmpmanager.h"
+#include "alarmmanager.h"
 #include "alarm.h"
-using namespace snmpmanager;
+using namespace alarmmanager;
 #include "liboamcpp.h"
 using namespace oam;
 #include "messagelog.h"
@@ -155,7 +155,7 @@ void processAlarm(const Alarm& calAlarm)
 
 	// get active alarms
 	AlarmList alarmList;
-	SNMPManager sm;
+	ALARMManager sm;
 	sm.getActiveAlarm (alarmList);
 	
         if (::DEBUG) {                                        
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 6954d6ac4..a42a62e13 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -37,7 +37,7 @@ using namespace logging;
 using namespace messageqcpp;
 using namespace processmanager;
 using namespace oam;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace threadpool;
 //using namespace procheartbeat;
 using namespace config;
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
 	ProcessLog log;
 	Configuration config;
 	ProcessManager processManager(config, log);
-	SNMPManager aManager;
+	ALARMManager aManager;
 
 	log.writeLog(__LINE__, " ");
 	log.writeLog(__LINE__, "**********Process Manager Started**********");
@@ -498,7 +498,7 @@ static void startMgrProcessThread()
 	Oam oam;
 	SystemModuleTypeConfig systemmoduletypeconfig;
 	ModuleTypeConfig PMSmoduletypeconfig;
-	SNMPManager aManager;
+	ALARMManager aManager;
 
 	log.writeLog(__LINE__, "startMgrProcessThread launched", LOG_TYPE_DEBUG);
 
@@ -815,7 +815,7 @@ void pingDeviceThread()
 	ProcessManager processManager(config, log);
 	Oam oam;
 	ModuleTypeConfig moduletypeconfig;
-	SNMPManager aManager;
+	ALARMManager aManager;
 	BRM::DBRM dbrm;
 
 	log.writeLog(__LINE__, "pingDeviceThread launched", LOG_TYPE_DEBUG);
@@ -2411,7 +2411,7 @@ static void heartbeatProcessThread()
 	Configuration config;
 	ProcessManager processManager(config, log);
 	Oam oam;
-	SNMPManager aManager;
+	ALARMManager aManager;
 
 	int processHeartbeatPeriod=60;	//default value to 60 seconds
 	
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index 3a16506b8..c56ebfb94 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -36,7 +36,7 @@ using namespace processmanager;
 using namespace messageqcpp;
 using namespace oam;
 using namespace logging;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace config;
 
 pthread_mutex_t STATUS_LOCK;
@@ -349,7 +349,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
 	ByteStream ackMsg;
 	ByteStream::byte status = 0;
 
-	SNMPManager aManager;
+	ALARMManager aManager;
 	SystemModuleTypeConfig systemmoduletypeconfig;
 	SystemProcessConfig systemprocessconfig;
 
@@ -2949,7 +2949,7 @@ int ProcessManager::getAlarmData(messageqcpp::IOSocket fIos, int type, std::stri
 
 	if ( type == GETALARMDATA ) {
 		try {
-			SNMPManager sm;
+			ALARMManager sm;
 			sm.getAlarm(date, alarmList);
 		}
 		catch(...)
@@ -2968,7 +2968,7 @@ int ProcessManager::getAlarmData(messageqcpp::IOSocket fIos, int type, std::stri
 	else
 	{
 		try {
-	        SNMPManager sm;
+	        ALARMManager sm;
 			sm.getActiveAlarm(alarmList);
 		}
 		catch(...)
@@ -3066,7 +3066,7 @@ int ProcessManager::startModule(string target, messageqcpp::ByteStream::byte act
 		log.writeLog(__LINE__, target + " module is started by request.", LOG_TYPE_DEBUG);
 	
 		//clear an alarm 
-		SNMPManager aManager;
+		ALARMManager aManager;
 		aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_MANUAL, CLEAR);
 		aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_AUTO, CLEAR);
 	}
@@ -3114,7 +3114,7 @@ int ProcessManager::stopModule(string target, ByteStream::byte actionIndicator,
 			setModuleState(target, oam::MAN_OFFLINE);
 		
 			//Issue an alarm 
-			SNMPManager aManager;				
+			ALARMManager aManager;				
 			aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_MANUAL, SET);
 		}
 		else
@@ -3122,7 +3122,7 @@ int ProcessManager::stopModule(string target, ByteStream::byte actionIndicator,
 			setModuleState(target, oam::AUTO_OFFLINE);
 		
 			//Issue an alarm 
-			SNMPManager aManager;				
+			ALARMManager aManager;				
 			aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_AUTO, SET);
 		}
 	}
@@ -3152,7 +3152,7 @@ int ProcessManager::stopModule(string target, ByteStream::byte actionIndicator,
 //				setModuleState(target, oam::MAN_OFFLINE);
 			
 				//Issue an alarm 
-				SNMPManager aManager;				
+				ALARMManager aManager;				
 				aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_MANUAL, SET);
 			}
 			else
@@ -3160,7 +3160,7 @@ int ProcessManager::stopModule(string target, ByteStream::byte actionIndicator,
 //				setModuleState(target, oam::AUTO_OFFLINE);
 			
 				//Issue an alarm 
-				SNMPManager aManager;
+				ALARMManager aManager;
 				aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_AUTO, SET);
 			}
 		}
@@ -3206,7 +3206,7 @@ int ProcessManager::shutdownModule(string target, ByteStream::byte actionIndicat
 			setProcessStates(target, oam::MAN_OFFLINE);
 
 			//Issue an alarm 
-			SNMPManager aManager;				
+			ALARMManager aManager;				
 			aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_MANUAL, SET);
 		}
 		else
@@ -3217,7 +3217,7 @@ int ProcessManager::shutdownModule(string target, ByteStream::byte actionIndicat
 			setProcessStates(target, oam::AUTO_OFFLINE);
 
 			//Issue an alarm 
-			SNMPManager aManager;				
+			ALARMManager aManager;				
 			aManager.sendAlarmReport(target.c_str(), MODULE_DOWN_AUTO, SET);
 		}
 	}
@@ -3716,7 +3716,7 @@ void ProcessManager::setSystemState(uint16_t state)
 {
 	ProcessLog log;
 	Oam oam;
-	SNMPManager aManager;
+	ALARMManager aManager;
 	Configuration config;
 
 	log.writeLog(__LINE__, "Set System State = " + oamState[state], LOG_TYPE_DEBUG);
@@ -6305,7 +6305,7 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist)
 	ProcessManager processManager(config, log);
 	Oam oam;
 	SystemModuleTypeConfig systemmoduletypeconfig;
-	SNMPManager aManager;
+	ALARMManager aManager;
 	int status = API_SUCCESS;
 	bool exitThread = false;
 	int exitThreadStatus = oam::API_SUCCESS;
@@ -6954,7 +6954,7 @@ void stopSystemThread(oam::DeviceNetworkList Devicenetworklist)
 	ProcessManager processManager(config, log);
 	Oam oam;
 	SystemModuleTypeConfig systemmoduletypeconfig;
-	SNMPManager aManager;
+	ALARMManager aManager;
 	int status = API_SUCCESS;
 	bool exitThread = false;
 	int exitThreadStatus = oam::API_SUCCESS;
@@ -7705,7 +7705,7 @@ int ProcessManager::updateWorkerNodeconfig()
 ******************************************************************************************/
 void ProcessManager::clearModuleAlarms(std::string moduleName)
 {
-	SNMPManager aManager;
+	ALARMManager aManager;
 	AlarmList alarmList;
 	aManager.getActiveAlarm (alarmList);
 
@@ -7734,7 +7734,7 @@ void ProcessManager::clearModuleAlarms(std::string moduleName)
 ******************************************************************************************/
 void ProcessManager::clearNICAlarms(std::string hostName)
 {
-	SNMPManager aManager;
+	ALARMManager aManager;
 	AlarmList alarmList;
 	aManager.getActiveAlarm (alarmList);
 
@@ -8406,7 +8406,7 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName)
 	ProcessManager processManager(config, log);
 	Oam oam;
 	int returnStatus = oam::API_SUCCESS;
-	SNMPManager aManager;
+	ALARMManager aManager;
 
 	log.writeLog(__LINE__, "switchParentOAMModule Function Started", LOG_TYPE_DEBUG);
 
@@ -9184,7 +9184,7 @@ int ProcessManager::OAMParentModuleChange()
 		startProcess(config.moduleName(), "SNMPTrapDaemon", oam::GRACEFUL);
 
 	// set alarm
-	SNMPManager aManager;
+	ALARMManager aManager;
 	aManager.sendAlarmReport(config.moduleName().c_str(), MODULE_SWITCH_ACTIVE, SET);
 
 	//set down Active module to disable state
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 36e6ab98d..512637ac3 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -31,7 +31,7 @@ using namespace messageqcpp;
 using namespace processmonitor;
 using namespace oam;
 using namespace logging;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace config;
 using namespace idbdatafile;
 
diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index 69719180e..aacba0461 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -34,7 +34,7 @@ using namespace cacheutils;
 using namespace std;
 using namespace oam;
 using namespace messageqcpp;
-using namespace snmpmanager;
+using namespace alarmmanager;
 using namespace logging;
 using namespace config;
 
@@ -2713,7 +2713,7 @@ void 	sendAlarmThread(sendAlarmInfo_t* t)
 {
 	MonitorLog log;
 	Oam oam;
-	SNMPManager alarmMgr;
+	ALARMManager alarmMgr;
 
 	pthread_mutex_lock(&ALARM_LOCK);
 
diff --git a/procmon/processmonitor.h b/procmon/processmonitor.h
index 2e43f6ab1..366217c84 100644
--- a/procmon/processmonitor.h
+++ b/procmon/processmonitor.h
@@ -31,7 +31,7 @@
 
 #include "liboamcpp.h"
 #include "shmkeys.h"
-#include "snmpglobal.h"
+#include "alarmglobal.h"
 #include "socketclosed.h"
 
 namespace processmonitor {
diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h
index 9f0e3c8d8..e84e983b4 100644
--- a/utils/funcexp/utils_utf8.h
+++ b/utils/funcexp/utils_utf8.h
@@ -36,8 +36,8 @@
 
 #include <clocale>
 
-#include "snmpmanager.h"
-using namespace snmpmanager;
+#include "alarmmanager.h"
+using namespace alarmmanager;
 
 #include "liboamcpp.h"
 using namespace oam;
@@ -78,7 +78,7 @@ std::string idb_setlocale()
 		try
 		{
 			//send alarm
-			SNMPManager alarmMgr;
+			ALARMManager alarmMgr;
 			std::string alarmItem = "system";
 			alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, SET);
 			printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str());
@@ -93,7 +93,7 @@ std::string idb_setlocale()
 		try
 		{
 			//send alarm
-			SNMPManager alarmMgr;
+			ALARMManager alarmMgr;
 			std::string alarmItem = "system";
 			alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, CLEAR);
 		}
diff --git a/versioning/BRM/masterdbrmnode.cpp b/versioning/BRM/masterdbrmnode.cpp
index d3f2fbb13..8f0f1958d 100644
--- a/versioning/BRM/masterdbrmnode.cpp
+++ b/versioning/BRM/masterdbrmnode.cpp
@@ -26,8 +26,8 @@
 
 #include "sessionmanager.h"
 #include "socketclosed.h"
-#include "snmpglobal.h"
-#include "snmpmanager.h"
+#include "alarmglobal.h"
+#include "alarmmanager.h"
 #include "liboamcpp.h"
 #include "stopwatch.h"
 #include "masterdbrmnode.h"
@@ -71,14 +71,14 @@
 #if 1
 #define SEND_ALARM \
 	try { \
-		snmpmanager::SNMPManager alarmMgr; \
-		alarmMgr.sendAlarmReport("System", oam::DBRM_READ_ONLY, snmpmanager::SET); \
+		alarmmanager::ALARMManager alarmMgr; \
+		alarmMgr.sendAlarmReport("System", oam::DBRM_READ_ONLY, alarmmanager::SET); \
 	} \
 	catch (...) { }
 #define CLEAR_ALARM \
 	try { \
-		snmpmanager::SNMPManager alarmMgr; \
-		alarmMgr.sendAlarmReport("System", oam::DBRM_READ_ONLY, snmpmanager::CLEAR); \
+		alarmmanager::ALARMManager alarmMgr; \
+		alarmMgr.sendAlarmReport("System", oam::DBRM_READ_ONLY, alarmmanager::CLEAR); \
 	} \
 	catch (...) { }
 #else
diff --git a/writeengine/client/we_clients.cpp b/writeengine/client/we_clients.cpp
index fb65b294c..b51537c21 100644
--- a/writeengine/client/we_clients.cpp
+++ b/writeengine/client/we_clients.cpp
@@ -51,8 +51,8 @@ using namespace config;
 using namespace logging;
 
 #include "liboamcpp.h"
-#include "snmpmanager.h"
-using namespace snmpmanager;
+#include "alarmmanager.h"
+using namespace alarmmanager;
 using namespace oam;
 
 #include "we_clients.h"
@@ -364,7 +364,7 @@ Error:
 			itor++;
 		}
 		// send alarm
-		SNMPManager alarmMgr;
+		ALARMManager alarmMgr;
 //		string alarmItem = sin_addr2String(client->serv_addr().sin_addr);
 		string alarmItem = client->addr2String();
 		alarmItem.append(" WriteEngineServer");
diff --git a/writeengine/splitter/we_sdhandler.cpp b/writeengine/splitter/we_sdhandler.cpp
index 28ded9649..2eb70baff 100644
--- a/writeengine/splitter/we_sdhandler.cpp
+++ b/writeengine/splitter/we_sdhandler.cpp
@@ -46,8 +46,8 @@ using namespace config;
 
 //-----
 
-#include "snmpmanager.h"
-using namespace snmpmanager;
+#include "alarmmanager.h"
+using namespace alarmmanager;
 
 #include "messagequeue.h"
 #include "bytestream.h"
diff --git a/writeengine/splitter/we_splclient.cpp b/writeengine/splitter/we_splclient.cpp
index 57b6cbf05..2a53c134b 100644
--- a/writeengine/splitter/we_splclient.cpp
+++ b/writeengine/splitter/we_splclient.cpp
@@ -49,8 +49,8 @@ using namespace messageqcpp;
 #include "liboamcpp.h"
 using namespace oam;
 
-#include "snmpmanager.h"
-using namespace snmpmanager;
+#include "alarmmanager.h"
+using namespace alarmmanager;
 
 #include "we_sdhandler.h"
 #include "we_splclient.h"
@@ -406,7 +406,7 @@ void WESplClient::onDisconnect()
 	try
 	{
 	// send alarm
-	SNMPManager alarmMgr;
+	ALARMManager alarmMgr;
 	//std::string alarmItem = sin_addr2String(fClnt->serv_addr().sin_addr);
 	std::string alarmItem = fClnt->addr2String();
 	alarmItem.append(" WriteEngineServer");