diff --git a/oamapps/alarmmanager/alarm.cpp b/oamapps/alarmmanager/alarm.cpp
index 0e2dd7adb..d8b336aeb 100644
--- a/oamapps/alarmmanager/alarm.cpp
+++ b/oamapps/alarmmanager/alarm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
+/* Copyright (C) 2016 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
diff --git a/oamapps/alarmmanager/alarm.h b/oamapps/alarmmanager/alarm.h
index b5537943d..48c617744 100644
--- a/oamapps/alarmmanager/alarm.h
+++ b/oamapps/alarmmanager/alarm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
+/* Copyright (C) 2016 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
diff --git a/oamapps/alarmmanager/alarmglobal.h b/oamapps/alarmmanager/alarmglobal.h
index 68b3366d2..fd22d3d97 100644
--- a/oamapps/alarmmanager/alarmglobal.h
+++ b/oamapps/alarmmanager/alarmglobal.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
-   Copyright (C) 2016 MariaDB Corporaton
+/* Copyright (C) 2016 MariaDB Corporaton
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp
index 8caf16937..499cc7755 100644
--- a/oamapps/alarmmanager/alarmmanager.cpp
+++ b/oamapps/alarmmanager/alarmmanager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
+/* Copyright (C) 2016 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
diff --git a/oamapps/alarmmanager/alarmmanager.h b/oamapps/alarmmanager/alarmmanager.h
index b615c948d..28909cbb7 100644
--- a/oamapps/alarmmanager/alarmmanager.h
+++ b/oamapps/alarmmanager/alarmmanager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
+/* Copyright (C) 2016 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
diff --git a/oamapps/alarmmanager/tdriver.cpp b/oamapps/alarmmanager/tdriver.cpp
index 8835e7f5c..a9994a4ed 100644
--- a/oamapps/alarmmanager/tdriver.cpp
+++ b/oamapps/alarmmanager/tdriver.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
+/* Copyright (C) 2016 MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -33,7 +33,6 @@ CPPUNIT_TEST_SUITE( ALARMManagerTest );
 CPPUNIT_TEST( test1 );
 CPPUNIT_TEST( test2 );
 //CPPUNIT_TEST( test3 );	// requires ProcMgr to be running
-CPPUNIT_TEST( test4 );
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -102,13 +101,6 @@ public:
 		cout << "NMS address: " << value << endl;
 	}
 
-	void test4() {
-		// set Server name in snmpdx.conf
-		ALARMManager sm;
-		sm.setSNMPModuleName();
-	}
-
-
 }; 
 
 CPPUNIT_TEST_SUITE_REGISTRATION( ALARMManagerTest );
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 512637ac3..b6ec2799f 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -1,5 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
-   Copyright (C) 2016 MariaDB Corporaton
+   Copyright (C) 2016 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License