--- LINUX-HA-MIB.mib.orig	2008-07-12 15:41:57.000000000 +0200
+++ LINUX-HA-MIB.mib	2008-07-12 15:41:39.000000000 +0200
@@ -20,8 +20,7 @@
 LINUX-HA-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
-    MODULE-IDENTITY, OBJECT-TYPE, enterprises,
-    Counter32, INTEGER, Integer32, Unsigned32, IpAddress
+    MODULE-IDENTITY, OBJECT-TYPE, enterprises, Integer32, Counter32, Unsigned32, NOTIFICATION-TYPE
 	FROM SNMPv2-SMI
 
     TEXTUAL-CONVENTION, DisplayString, 
@@ -31,145 +30,145 @@
     MODULE-COMPLIANCE, OBJECT-GROUP		    
 	FROM SNMPv2-CONF;
 
-LinuxHA	MODULE-IDENTITY
-    LAST-UPDATED "200711260000Z"	-- Nov. 26, 2007
+linuxHA	MODULE-IDENTITY
+    LAST-UPDATED "200711260000Z"        -- Nov. 26, 2007
     ORGANIZATION "High-Availability Linux Project"
     CONTACT-INFO
-	"Alan Robertson
-	Postal:	Linux-HA Project
-		13750 Bayberry Drive
-		Broomfield, CO 80020-6163
-	Phone:	303-466-7405
-	FAX:	n/a
-	Email:	alanr@unix.sh
-
-	Yixiong Zou
-	Postal: Intel Corp.  
-		CO5-162
-		15400 NW Greenbrier Parkway
-		Beaverton, OR 97006
-		USA
-	Phone:	503-677-4988
-	Fax:	503-677-6670
-	Email:	yixiong.zou@intel.com
-
-	In addition, the Linux-HA mailing list is where all the 
-	discussion about this MIB happens. To join the mailing list, 
-	send a request message to linux-ha-subscribe@muc.de.  
-	The mailing list address is
-	linux-ha-dev@lists.community.tummy.com."
-    DESCRIPTION
-	"This MIB can be used to manage a Linux-HA cluster. The
-	initial plan is to make the heartbeat, resource managment,
-	and memberships accessible through SNMP. Hopefully more
-	things can be added as Linux-HA matures."
+        "Alan Robertson
+        Postal: Linux-HA Project
+                13750 Bayberry Drive
+                Broomfield, CO 80020-6163
+        Phone:  303-466-7405
+        FAX:    n/a
+        Email:  alanr@unix.sh
+
+        Yixiong Zou
+        Postal: Intel Corp.  
+                CO5-162
+                15400 NW Greenbrier Parkway
+                Beaverton, OR 97006
+                USA
+        Phone:  503-677-4988
+        Fax:    503-677-6670
+        Email:  yixiong.zou@intel.com
+
+        In addition, the Linux-HA mailing list is where all the 
+        discussion about this MIB happens. To join the mailing list, 
+        send a request message to linux-ha-subscribe@muc.de.  
+        The mailing list address is
+        linux-ha-dev@lists.community.tummy.com."
+    DESCRIPTION
+        "This MIB can be used to manage a Linux-HA cluster. The
+        initial plan is to make the heartbeat, resource managment,
+        and memberships accessible through SNMP. Hopefully more
+        things can be added as Linux-HA matures."
 
-    REVISION "200711260000Z"	-- Nov. 26, 2007
+    REVISION "200711260000Z"    -- Nov. 26, 2007
     DESCRIPTION
-	"The original version of this MIB."
+        "The original version of this MIB."
     ::= { enterprises 4682 }
 
--- Current LinuxHA core MIB entries
---  LHAClusterInfo 	      OBJECT IDENTIFIER ::= { LinuxHA 1 }
---  LHANodeTable	      OBJECT IDENTIFIER ::= { LinuxHA 2 }
---  LHAIFStatusTable	      OBJECT IDENTIFIER ::= { LinuxHA 3 }
---  LHAResourceGroupTable     OBJECT IDENTIFIER ::= { LinuxHA 4 }
---  LHAMembershipTable	      OBJECT IDENTIFIER ::= { LinuxHA 6 }
---  LHAHeartbeatConfigInfo    OBJECT IDENTIFIER ::= { LinuxHA 7 }
---  LHAResourceTable          OBJECT IDENTIFIER ::= { LinuxHA 8 }
---  LHATrapTable	      OBJECT IDENTIFIER ::= { LinuxHA 900 }
+-- Current linuxHA core MIB entries
+--  lhaClusterInfo 	      OBJECT IDENTIFIER ::= { linuxHA 1 }
+--  lhaNodeTable	      OBJECT IDENTIFIER ::= { linuxHA 2 }
+--  lhaIFStatusTable	      OBJECT IDENTIFIER ::= { linuxHA 3 }
+--  lhaResourceGroupTable     OBJECT IDENTIFIER ::= { linuxHA 4 }
+--  lhaMembershipTable	      OBJECT IDENTIFIER ::= { linuxHA 6 }
+--  lhaHeartbeatConfigInfo    OBJECT IDENTIFIER ::= { linuxHA 7 }
+--  lhaResourceTable          OBJECT IDENTIFIER ::= { linuxHA 8 }
+--  lhaTrapTable	      OBJECT IDENTIFIER ::= { linuxHA 900 }
 
 LHAUUIDString ::= TEXTUAL-CONVENTION
     DISPLAY-HINT "4x-2x-2x-2x-4x2x"
     STATUS       current
-    DESCRIPTION
-    	"A string that represents a UUID"
+    DESCRIPTION  "A string that represents a UUID"
     SYNTAX       OCTET STRING (SIZE (16))
 
-LHAClusterInfo		OBJECT IDENTIFIER ::= { LinuxHA 1 }
 
-LHATotalNodeCount OBJECT-TYPE
+lhaClusterInfo OBJECT IDENTIFIER ::= { linuxHA 1 }
+
+lhaTotalNodeCount OBJECT-TYPE
     SYNTAX	Counter32
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The number of nodes that are currently configured for this
 	cluster."
-    ::= { LHAClusterInfo 1 }
+    ::= { lhaClusterInfo 1 }
 
-LHALiveNodeCount OBJECT-TYPE
+lhaLiveNodeCount OBJECT-TYPE
     SYNTAX	Counter32
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The number of nodes that are currently active in this
 	cluster."
-    ::= { LHAClusterInfo 2 }
+    ::= { lhaClusterInfo 2 }
 
-LHACurrentNodeID OBJECT-TYPE
+lhaCurrentNodeID OBJECT-TYPE
     SYNTAX	Integer32
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The nodes id of the host that this agent currently
-	represents.  This value is the same as the LHANodeIndex value
+	represents.  This value is the same as the lhaNodeIndex value
 	of this node."
-    ::= { LHAClusterInfo 3 }
+    ::= { lhaClusterInfo 3 }
 
-LHAResourceGroupCount OBJECT-TYPE
+lhaResourceGroupCount OBJECT-TYPE
     SYNTAX	Counter32
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The total number of Resource Groups that have been
 	configured for this cluster."
-    ::= { LHAClusterInfo 4 }
+    ::= { lhaClusterInfo 4 }
 
-LHANodeTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF lhaNodeEntry
+lhaNodeTable OBJECT-TYPE
+    SYNTAX	SEQUENCE OF LHANodeEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A table contains information about all the nodes in the
 	cluster."
-    ::= { LinuxHA 2 }
+    ::= { linuxHA 2 }
 
-LHANodeEntry OBJECT-TYPE
-    SYNTAX	lhaNodeEntry
+lhaNodeEntry OBJECT-TYPE
+    SYNTAX	LHANodeEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION	
 	"An entry containing a node and its statistics."
-    INDEX	{ LHANodeIndex }
-    ::= { LHANodeTable 1 }
+    INDEX	{ lhaNodeIndex }
+    ::= { lhaNodeTable 1 }
 
-lhaNodeEntry ::= SEQUENCE {
-    LHANodeIndex	    Integer32,
-    LHANodeName	    	    DisplayString,
-    LHANodeType		    INTEGER,
-    LHANodeStatus           INTEGER,
-    LHANodeUUID		    DisplayString,
-    LHANodeIFCount	    Counter32,
-}
+LHANodeEntry ::= SEQUENCE {
+    lhaNodeIndex	    Integer32,
+    lhaNodeName	    	    DisplayString,
+    lhaNodeType		    INTEGER,
+    lhaNodeStatus           INTEGER,
+    lhaNodeUUID		    LHAUUIDString,
+    lhaNodeIFCount	    Counter32
+    }
 
-LHANodeIndex OBJECT-TYPE    
+lhaNodeIndex OBJECT-TYPE    
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"An integer that identifies a node in a cluster for a given
 	snmp session."
-    ::= { LHANodeEntry 1 }
+    ::= { lhaNodeEntry 1 }
 
-LHANodeName OBJECT-TYPE
+lhaNodeName OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"A human readable name that represents that node."
-    ::= { LHANodeEntry 2 }
+    ::= { lhaNodeEntry 2 }
 
-LHANodeType OBJECT-TYPE
+lhaNodeType OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    unknown (0),
 		    normal (1),
@@ -185,9 +184,9 @@
 	
 	So far only the normal node and ping node are defined.  All
 	the rest will fall into the 'unknown' catagory. "
-    ::= { LHANodeEntry 3 }
+    ::= { lhaNodeEntry 3 }
 
-LHANodeStatus OBJECT-TYPE
+lhaNodeStatus OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    unknown (0),
 		    init (1),
@@ -203,9 +202,9 @@
 
 	So far, only these four states are defined.  All the rest
 	falls in 'unknown' catagory."
-    ::= { LHANodeEntry 4 }
+    ::= { lhaNodeEntry 4 }
 
-LHANodeUUID OBJECT-TYPE
+lhaNodeUUID OBJECT-TYPE
     SYNTAX	LHAUUIDString
     MAX-ACCESS	read-only
     STATUS	current
@@ -213,59 +212,59 @@
 	"The UUID of the current node in string representatio.  This
 	UUID will be persisted over the heartbeat session.  So it can
 	be used as a unique identifier for a node."
-    ::= { LHANodeEntry 5 }
+    ::= { lhaNodeEntry 5 }
 
-LHANodeIFCount OBJECT-TYPE
+lhaNodeIFCount OBJECT-TYPE
     SYNTAX	Counter32
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The number of interfaces that is used by heartbeat
 	for this node."
-    ::= { LHANodeEntry 6 }
+    ::= { lhaNodeEntry 6 }
 
-LHAIFStatusTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF lhaIFEntry
+lhaIFStatusTable OBJECT-TYPE
+    SYNTAX	SEQUENCE OF LHAIFStatusEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A table describes all the interfaces that are used by the
 	heartbeat cluster."
-    ::= { LinuxHA 3 }
+    ::= { linuxHA 3 }
 
-LHAIFStatusEntry OBJECT-TYPE
-    SYNTAX	lhaIFStatusEntry
+lhaIFStatusEntry OBJECT-TYPE
+    SYNTAX	LHAIFStatusEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"An entry containing information about that interface.
-	The LHANodeIndex is listed in the LHANodeTable."
-    INDEX	{ LHANodeIndex, LHAIFIndex }
-    ::= { LHAIFStatusTable 1 }
-
-lhaIFStatusEntry ::= SEQUENCE {
-    LHAIFIndex	    	Integer32,
-    LHAIFName	    	DisplayString,
-    LHAIFStatus		INTEGER
+	The lhaNodeIndex is listed in the lhaNodeTable."
+    INDEX	{ lhaNodeIndex, lhaIFIndex }
+    ::= { lhaIFStatusTable 1 }
+
+LHAIFStatusEntry ::= SEQUENCE {
+    lhaIFIndex	    	Integer32,
+    lhaIFName	    	DisplayString,
+    lhaIFStatus		INTEGER
 }
 
-LHAIFIndex OBJECT-TYPE
+lhaIFIndex OBJECT-TYPE
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"An unique integer identifies this interface."
-    ::= { LHAIFStatusEntry 1 }
+    ::= { lhaIFStatusEntry 1 }
 
-LHAIFName OBJECT-TYPE
+lhaIFName OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"A name for this interface."
-    ::= { LHAIFStatusEntry 2 }
+    ::= { lhaIFStatusEntry 2 }
 
-LHAIFStatus OBJECT-TYPE
+lhaIFStatus OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    unknown (0),
 		    up (1),
@@ -278,61 +277,61 @@
 	
 	Currently only up and down are defined as the interface
 	status.  All the others will fall into the unknown catagory."
-    ::= { LHAIFStatusEntry 3 }
+    ::= { lhaIFStatusEntry 3 }
 
 
-LHAResourceGroupTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF lhaResourceGroupEntry
+lhaResourceGroupTable OBJECT-TYPE
+    SYNTAX	SEQUENCE OF LHAResourceGroupEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A table containing information of all the resource groups."
-    ::= { LinuxHA 4 }
+    ::= { linuxHA 4 }
 
-LHAResourceGroupEntry OBJECT-TYPE
-    SYNTAX	lhaResourceGroupEntry
+lhaResourceGroupEntry OBJECT-TYPE
+    SYNTAX	LHAResourceGroupEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"An entry that describes the resource group and its
 	information."
-    INDEX	{ LHAResourceGroupIndex }
-    ::= { LHAResourceGroupTable 1 }
+    INDEX	{ lhaResourceGroupIndex }
+    ::= { lhaResourceGroupTable 1 }
 
-lhaResourceGroupEntry ::= SEQUENCE	{
-    LHAResourceGroupIndex	Integer32,
-    LHAResourceGroupMaster	DisplayString,
-    LHAResourceGroupResources   DisplayString,
-    LHAResourceGroupStatus	Integer32
+LHAResourceGroupEntry ::= SEQUENCE	{
+    lhaResourceGroupIndex	Integer32,
+    lhaResourceGroupMaster	Integer32,
+    lhaResourceGroupResources   DisplayString,
+    lhaResourceGroupStatus	Unsigned32
 }
 
-LHAResourceGroupIndex OBJECT-TYPE
+lhaResourceGroupIndex OBJECT-TYPE
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A unique integer that identifies this resource group."
-    ::= { LHAResourceGroupEntry 1 }
+    ::= { lhaResourceGroupEntry 1 }
 
-LHAResourceGroupMaster OBJECT-TYPE
+lhaResourceGroupMaster OBJECT-TYPE
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The master node id of this resource group.  This is 
-	the LHANodeIndex for the master node of this resource
+	the lhaNodeIndex for the master node of this resource
 	group. "
-    ::= { LHAResourceGroupEntry 2 }
+    ::= { lhaResourceGroupEntry 2 }
 
-LHAResourceGroupResources OBJECT-TYPE
+lhaResourceGroupResources OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The resources contained in this resource group."
-    ::= { LHAResourceGroupEntry 3 }
+    ::= { lhaResourceGroupEntry 3 }
 
-LHAResourceGroupStatus OBJECT-TYPE
+lhaResourceGroupStatus OBJECT-TYPE
     SYNTAX	Unsigned32 (0..255)
     MAX-ACCESS	read-only
     STATUS	current
@@ -348,10 +347,10 @@
 	 150-199 reserved for application use
 	 200-254 reserved
 	 "
-    ::= { LHAResourceGroupEntry 4 }
+    ::= { lhaResourceGroupEntry 4 }
 
-LHAMembershipTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF lhaMembershipEntry
+lhaMembershipTable OBJECT-TYPE
+    SYNTAX	SEQUENCE OF LHAMembershipEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
@@ -362,68 +361,68 @@
 
 	If this table does not contain any entries, that means the 
 	node is not part of the cluster membership."
-    ::= { LinuxHA 6 }
+    ::= { linuxHA 6 }
 
-LHAMembershipEntry OBJECT-TYPE
-    SYNTAX	lhaMembershipEntry
+lhaMembershipEntry OBJECT-TYPE
+    SYNTAX	LHAMembershipEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"An entry containing a member and its status."
-    INDEX	{ LHAMemberIndex }
-    ::= { LHAMembershipTable 1 }
+    INDEX	{ lhaMemberIndex }
+    ::= { lhaMembershipTable 1 }
 
-lhaMembershipEntry ::= SEQUENCE {
-    LHAMemberIndex   		Integer32,
-    LHAMemberName    		DisplayString,
-    LHAMemberAddress 		DisplayString,
-    LHAMemberClusterName	DisplayString,
-    LHAMemberIsMember		TruthValue,
-    LHAMemberLastChange 	INTEGER,
-    LHAMemberBootTime 		TimeStamp,
+LHAMembershipEntry ::= SEQUENCE {
+    lhaMemberIndex   		Integer32,
+    lhaMemberName    		DisplayString,
+    lhaMemberAddress 		OCTET STRING,
+    lhaMemberClusterName	DisplayString,
+    lhaMemberIsMember		TruthValue,
+    lhaMemberLastChange 	INTEGER,
+    lhaMemberBootTime 		TimeStamp
 }
 
-LHAMemberIndex OBJECT-TYPE
+lhaMemberIndex OBJECT-TYPE
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A unique integer that identifies this member."
-    ::= { LHAMembershipEntry 1 }
+    ::= { lhaMembershipEntry 1 }
 
-LHAMemberName OBJECT-TYPE
+lhaMemberName OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The name of the cluster member."
-    ::= { LHAMembershipEntry 2 }
+    ::= { lhaMembershipEntry 2 }
 
-LHAMemberAddress OBJECT-TYPE
+lhaMemberAddress OBJECT-TYPE
     SYNTAX	OCTET STRING (SIZE (64))
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The address of the cluster member."
-    ::= { LHAMembershipEntry 3 }
+    ::= { lhaMembershipEntry 3 }
 
-LHAMemberClusterName OBJECT-TYPE
+lhaMemberClusterName OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The name of this cluster."
-    ::= { LHAMembershipEntry 4 }
+    ::= { lhaMembershipEntry 4 }
 
-LHAMemberIsMember OBJECT-TYPE
+lhaMemberIsMember OBJECT-TYPE
     SYNTAX	TruthValue
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"If this node is part of the membership or not."
-    ::= { LHAMembershipEntry 5 }
+    ::= { lhaMembershipEntry 5 }
 
-LHAMemberLastChange OBJECT-TYPE
+lhaMemberLastChange OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    undefined (0),
 		    nochange (1),
@@ -434,80 +433,80 @@
     STATUS	current
     DESCRIPTION
 	"If this node is part of the membership or not."
-    ::= { LHAMembershipEntry 6 }
+    ::= { lhaMembershipEntry 6 }
 
-LHAMemberBootTime OBJECT-TYPE
+lhaMemberBootTime OBJECT-TYPE
     SYNTAX	TimeStamp
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The time when this cluster member last started."
-    ::= { LHAMembershipEntry 7 }
+    ::= { lhaMembershipEntry 7 }
 
-LHAHeartbeatConfigInfo		OBJECT IDENTIFIER ::= { LinuxHA 7 }
+lhaHeartbeatConfigInfo		OBJECT IDENTIFIER ::= { linuxHA 7 }
 
-LHAHBVersion OBJECT-TYPE
+lhaHBVersion OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The heartbeat version."
-    ::= { LHAHeartbeatConfigInfo 1 }
+    ::= { lhaHeartbeatConfigInfo 1 }
 
-LHAKeepAlive OBJECT-TYPE
+lhaKeepAlive OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The heartbeat interval."
-    ::= { LHAHeartbeatConfigInfo 3 }
+    ::= { lhaHeartbeatConfigInfo 3 }
 
-LHADeadTime OBJECT-TYPE
+lhaDeadTime OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The time it waits before declaring a node to be dead."
-    ::= { LHAHeartbeatConfigInfo 4 }
+    ::= { lhaHeartbeatConfigInfo 4 }
 
-LHADeadPing OBJECT-TYPE
+lhaDeadPing OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The time it waits before declaring a ping node to be dead."
-    ::= { LHAHeartbeatConfigInfo 5 }
+    ::= { lhaHeartbeatConfigInfo 5 }
 
-LHAWarnTime OBJECT-TYPE
+lhaWarnTime OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The time it waits before issuing a 'late heartbeat' warning."
-    ::= { LHAHeartbeatConfigInfo 6 }
+    ::= { lhaHeartbeatConfigInfo 6 }
 
-LHAInitDead OBJECT-TYPE
+lhaInitDead OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"Very first dead time.  Should be twice the normal dead time."
-    ::= { LHAHeartbeatConfigInfo 7 }
+    ::= { lhaHeartbeatConfigInfo 7 }
 
-LHABaudRate OBJECT-TYPE
+lhaBaudRate OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"Baud rate for serial ports."
-    ::= { LHAHeartbeatConfigInfo 9 }
+    ::= { lhaHeartbeatConfigInfo 9 }
 
-LHAAutoFailBack OBJECT-TYPE
+lhaAutoFailBack OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    undefined (0),
 		    on (1),
 		    off (2),
-		    legacy (3),
+		    legacy (3)
     		}
     MAX-ACCESS	read-only
     STATUS	current
@@ -516,77 +515,77 @@
 	its primary node, or remain on whatever the node is serving.
 	
 	Possible values are: on, off, legacy."
-    ::= { LHAHeartbeatConfigInfo 12 }
+    ::= { lhaHeartbeatConfigInfo 12 }
 
-LHAStonith OBJECT-TYPE
+lhaStonith OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The STONITH device configured for this cluster."
-    ::= { LHAHeartbeatConfigInfo 13 }
+    ::= { lhaHeartbeatConfigInfo 13 }
 
-LHAStonithHost OBJECT-TYPE
+lhaStonithHost OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The STONITH host configured for this cluster."
-    ::= { LHAHeartbeatConfigInfo 14 }
+    ::= { lhaHeartbeatConfigInfo 14 }
 
-LHARespawn OBJECT-TYPE
+lhaRespawn OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The other services that got respawned by heartbeat daemon."
-    ::= { LHAHeartbeatConfigInfo 15 }
+    ::= { lhaHeartbeatConfigInfo 15 }
 
-LHAResourceTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF lhaResourceEntry
+lhaResourceTable OBJECT-TYPE
+    SYNTAX	SEQUENCE OF LHAResourceEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A table containing information of all the resource for V2."
-    ::= { LinuxHA 8 }
+    ::= { linuxHA 8 }
 
-LHAResourceEntry OBJECT-TYPE
-    SYNTAX	lhaResourceEntry
+lhaResourceEntry OBJECT-TYPE
+    SYNTAX	LHAResourceEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"An entry that describes the resource and its status for V2."
-    INDEX	{ LHAResourceIndex }
-    ::= { LHAResourceTable 1 }
+    INDEX	{ lhaResourceIndex }
+    ::= { lhaResourceTable 1 }
 
-lhaResourceEntry ::= SEQUENCE	{
-    LHAResourceIndex	Integer32,
-    LHAResourceName	DisplayString,
-    LHAResourceType     INTEGER,
-    LHAResourceNode	DisplayString,
-    LHAResourceStatus	INTEGER,
-    LHAResourceIsManaged	INTEGER,
-    LHAResourceFailCount	Integer32,
-    LHAResourceParent	DisplayString,
+LHAResourceEntry ::= SEQUENCE	{
+    lhaResourceIndex	Integer32,
+    lhaResourceName	DisplayString,
+    lhaResourceType     INTEGER,
+    lhaResourceNode	DisplayString,
+    lhaResourceStatus	INTEGER,
+    lhaResourceIsManaged	INTEGER,
+    lhaResourceFailCount	Integer32,
+    lhaResourceParent	DisplayString
 }
 
-LHAResourceIndex OBJECT-TYPE
+lhaResourceIndex OBJECT-TYPE
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	"A unique integer that identifies this resource."
-    ::= { LHAResourceEntry 1 }
+    ::= { lhaResourceEntry 1 }
 
-LHAResourceName OBJECT-TYPE
+lhaResourceName OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The name of this resource."
-    ::= { LHAResourceEntry 2 }
+    ::= { lhaResourceEntry 2 }
 
-LHAResourceType OBJECT-TYPE
+lhaResourceType OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    unknown (0),
 		    primitive (1),
@@ -604,17 +603,17 @@
 	 3       clone resource.
 	 4	     master/slave resource.
 	 "
-    ::= { LHAResourceEntry 3 }
+    ::= { lhaResourceEntry 3 }
 
-LHAResourceNode OBJECT-TYPE
+lhaResourceNode OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The node name that this resource resides on."
-    ::= { LHAResourceEntry 4 }
+    ::= { lhaResourceEntry 4 }
 
-LHAResourceStatus OBJECT-TYPE
+lhaResourceStatus OBJECT-TYPE
     SYNTAX	INTEGER {
 	    	    unknown (0),
 		    stopped (1),
@@ -632,9 +631,9 @@
 	 3       program is started in slave state.
 	 4	 program is started in master state.
 	 "
-    ::= { LHAResourceEntry 5 }
+    ::= { lhaResourceEntry 5 }
 
-LHAResourceIsManaged OBJECT-TYPE
+lhaResourceIsManaged OBJECT-TYPE
     SYNTAX	INTEGER {
 		    unmanaged (0),
 		    managed (1)
@@ -646,66 +645,66 @@
 	 0       resource is not managed.
 	 1       resource is managed.
 	 "
-    ::= { LHAResourceEntry 6 }
+    ::= { lhaResourceEntry 6 }
 
-LHAResourceFailCount OBJECT-TYPE
+lhaResourceFailCount OBJECT-TYPE
     SYNTAX	Integer32 (0..65535)
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The value of this resource's fail-count."
-    ::= { LHAResourceEntry 7 }
+    ::= { lhaResourceEntry 7 }
 
-LHAResourceParent OBJECT-TYPE
+lhaResourceParent OBJECT-TYPE
     SYNTAX	DisplayString
     MAX-ACCESS	read-only
     STATUS	current
     DESCRIPTION
 	"The name of this resource's parent resource."
-    ::= { LHAResourceEntry 8 }
+    ::= { lhaResourceEntry 8 }
 
-LHATrapTable                    OBJECT IDENTIFIER ::= { LinuxHA 900 }
+lhaTrapTable                    OBJECT IDENTIFIER ::= { linuxHA 900 }
 
-LHANodeStatusUpdate NOTIFICATION-TYPE
-    OBJECTS { LHANodeName LHANodeStatus }
+lhaNodeStatusUpdate NOTIFICATION-TYPE
+    OBJECTS { lhaNodeName, lhaNodeStatus }
     STATUS  current
     DESCRIPTION
     	"A node status change event just happened."
-    ::= { LHATrapTable 1 }
+    ::= { lhaTrapTable 1 }
 
-LHAIFStatusUpdate NOTIFICATION-TYPE
-    OBJECTS { LHANodeName LHAIFName LHAIFStatus }
+lhaIFStatusUpdate NOTIFICATION-TYPE
+    OBJECTS { lhaNodeName, lhaIFName, lhaIFStatus }
     STATUS  current
     DESCRIPTION
     	"A link status just changed."
-    ::= { LHATrapTable 3 }
+    ::= { lhaTrapTable 3 }
 
-LHAMembershipChange NOTIFICATION-TYPE
-    OBJECTS { LHANodeName LHAMemberLastChange }
+lhaMembershipChange NOTIFICATION-TYPE
+    OBJECTS { lhaNodeName, lhaMemberLastChange }
     STATUS  current
     DESCRIPTION
     	"A node just changed it membership. "
-    ::= { LHATrapTable 5 }
+    ::= { lhaTrapTable 5 }
 
-LHAHBAgentOnline NOTIFICATION-TYPE
-    OBJECTS { LHANodeName }
+lhaHBAgentOnline NOTIFICATION-TYPE
+    OBJECTS { lhaNodeName }
     STATUS  current
     DESCRIPTION
     	"The heartbeat agent for this node is online and ready to accept queries. "
-    ::= { LHATrapTable 7 }
+    ::= { lhaTrapTable 7 }
 
-LHAHBAgentOffline NOTIFICATION-TYPE
-    OBJECTS { LHANodeName }
+lhaHBAgentOffline NOTIFICATION-TYPE
+    OBJECTS { lhaNodeName }
     STATUS  current
     DESCRIPTION
     	"The heartbeat agent for this node is offline. "
-    ::= { LHATrapTable 9 }
+    ::= { lhaTrapTable 9 }
 
-LHAResourceStatusUpdate NOTIFICATION-TYPE
-    OBJECTS { LHAResourceName LHAResourceNode LHAResourceStatus }
+lhaResourceStatusUpdate NOTIFICATION-TYPE
+    OBJECTS { lhaResourceName, lhaResourceNode, lhaResourceStatus }
     STATUS  current
     DESCRIPTION
     	"A resource status change event just happened."
-    ::= { LHATrapTable 11 }
+    ::= { lhaTrapTable 11 }
 
 END
