diff --git a/doc/wrs_failures/snmp_objects.tex b/doc/wrs_failures/snmp_objects.tex
index 43ce0c697bcb3b7c6472d37322d32d419092ae94..45c8fbbb7945caee79ce2cfa4292b84955852e14 100644
--- a/doc/wrs_failures/snmp_objects.tex
+++ b/doc/wrs_failures/snmp_objects.tex
@@ -651,10 +651,10 @@
     is a serial number of an instance on particular port.}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstancePortIndex.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstanceOnPortIndex.<n>.<m>}{}
+  \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstanceName.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstancePort.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstancePortInstance.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstancePortName.<n>.<m>}{}
-  \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstanceName.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstanceState.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstanceStateNext.<n>.<m>}{}
   \snmpentrye{WR-SWITCH-MIB}{wrsPtpInstanceTable}{wrsPtpInstanceRole.<n>.<m>}{}
diff --git a/userspace/snmpd/WR-SWITCH-MIB.txt b/userspace/snmpd/WR-SWITCH-MIB.txt
index 198045a09efbd99a55f8e23a4798785d67cdca7f..fbb37d7436ccfc90094ce8c4d54a036fe778a996 100644
--- a/userspace/snmpd/WR-SWITCH-MIB.txt
+++ b/userspace/snmpd/WR-SWITCH-MIB.txt
@@ -37,6 +37,7 @@ wrSwitchMIB MODULE-IDENTITY
          - wrsPortStatusSfpTxBias
          - wrsPortStatusSfpTxPower
          - wrsPortStatusSfpRxPower
+         Add wrsPtpInstanceTable
         "
 
     REVISION     "201602171600Z"
@@ -2634,10 +2635,10 @@ WrsPtpInstanceEntry ::=
     SEQUENCE {
         wrsPtpInstancePortIndex          Unsigned32,
         wrsPtpInstanceOnPortIndex        Unsigned32,
+        wrsPtpInstanceName               DisplayString,
         wrsPtpInstancePort               INTEGER,
         wrsPtpInstancePortInstance       INTEGER,
         wrsPtpInstancePortName           DisplayString,
-        wrsPtpInstanceName               DisplayString,
         wrsPtpInstanceState              INTEGER,
         wrsPtpInstanceStateNext          INTEGER,
         wrsPtpInstanceRole               INTEGER,
@@ -2666,36 +2667,36 @@ wrsPtpInstanceOnPortIndex OBJECT-TYPE
             "Index for wrsPtpInstanceTable"
     ::= { wrsPtpInstanceEntry 2 }
 
-wrsPtpInstancePort OBJECT-TYPE
-    SYNTAX         INTEGER
+wrsPtpInstanceName OBJECT-TYPE
+    SYNTAX         DisplayString (SIZE (0..12))
     MAX-ACCESS     read-only
     STATUS         current
     DESCRIPTION
-            "Port number on which an instance is running"
+            "Name of an instance"
     ::= { wrsPtpInstanceEntry 3 }
 
-wrsPtpInstancePortInstance OBJECT-TYPE
+wrsPtpInstancePort OBJECT-TYPE
     SYNTAX         INTEGER
     MAX-ACCESS     read-only
     STATUS         current
     DESCRIPTION
-            "Index of an instance running on a port"
+            "Port number on which an instance is running"
     ::= { wrsPtpInstanceEntry 4 }
 
-wrsPtpInstancePortName OBJECT-TYPE
-    SYNTAX         DisplayString (SIZE (0..12))
+wrsPtpInstancePortInstance OBJECT-TYPE
+    SYNTAX         INTEGER
     MAX-ACCESS     read-only
     STATUS         current
     DESCRIPTION
-            "Port name of port"
+            "Index of an instance running on a port"
     ::= { wrsPtpInstanceEntry 5 }
 
-wrsPtpInstanceName OBJECT-TYPE
+wrsPtpInstancePortName OBJECT-TYPE
     SYNTAX         DisplayString (SIZE (0..12))
     MAX-ACCESS     read-only
     STATUS         current
     DESCRIPTION
-            "Name of an instance"
+            "Port name of port"
     ::= { wrsPtpInstanceEntry 6 }
 
 wrsPtpInstanceState OBJECT-TYPE
diff --git a/userspace/snmpd/wrsPtpInstanceTable.c b/userspace/snmpd/wrsPtpInstanceTable.c
index 4d572b88708098c2fd6d7b87c66257d84c564281..ec71d64833fce975991bbfc3e0df26b7d1c9e88f 100644
--- a/userspace/snmpd/wrsPtpInstanceTable.c
+++ b/userspace/snmpd/wrsPtpInstanceTable.c
@@ -8,10 +8,10 @@ static struct pickinfo wrsPtpInstanceTable_pickinfo[] = {
 	/* Warning: strings are a special case for snmp format */
 	FIELD(wrsPtpInstanceTable_s, ASN_UNSIGNED, wrsPtpInstancePortIndex), /* not reported */
 	FIELD(wrsPtpInstanceTable_s, ASN_UNSIGNED, wrsPtpInstanceOnPortIndex), /* not reported */
+	FIELD(wrsPtpInstanceTable_s, ASN_OCTET_STR, wrsPtpInstanceName),
 	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER, wrsPtpInstancePort),
 	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER, wrsPtpInstancePortInstance),
 	FIELD(wrsPtpInstanceTable_s, ASN_OCTET_STR, wrsPtpInstancePortName),
-	FIELD(wrsPtpInstanceTable_s, ASN_OCTET_STR, wrsPtpInstanceName),
 	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER, wrsPtpInstanceState),
 	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER, wrsPtpInstanceStateNext),
 	FIELD(wrsPtpInstanceTable_s, ASN_INTEGER, wrsPtpInstanceRole),
diff --git a/userspace/snmpd/wrsPtpInstanceTable.h b/userspace/snmpd/wrsPtpInstanceTable.h
index 178ff39f12eb68021eb9be9a04bf7050ce66eaa6..4e64311cd6c108c4f2779318d0e10fbdc27094f1 100644
--- a/userspace/snmpd/wrsPtpInstanceTable.h
+++ b/userspace/snmpd/wrsPtpInstanceTable.h
@@ -14,10 +14,10 @@ struct wrsPtpInstanceTable_s {
 	uint32_t wrsPtpInstancePortIndex;		/* not reported, index fields has t o be marked
 				 * as not-accessible in MIB */
 	uint32_t wrsPtpInstanceOnPortIndex;	/* port on which ptp instance is running (index+1) */
+	char wrsPtpInstanceName[16];	/* Instance name */
 	int wrsPtpInstancePort;	/* port on which ptp instance is running (index+1) */
 	int wrsPtpInstancePortInstance; /* serial of instance running on a given port  */
 	char wrsPtpInstancePortName[16];/* port name on which ptp instance is running (wriX) */
-	char wrsPtpInstanceName[16];	/* Instance name */
 	int wrsPtpInstanceState;
 	int wrsPtpInstanceStateNext;
 	int wrsPtpInstanceRole;