diff --git a/Info/Bridge.pm b/Info/Bridge.pm
index 1330c091..01bae569 100644
--- a/Info/Bridge.pm
+++ b/Info/Bridge.pm
@@ -88,6 +88,7 @@ $VERSION = '3.20';
     # to return a hash reference to ease API compatibility with
     # MST and PVST implementations indexed by a spanning tree
     # instance id
+    'stp_i_mac'       => 'dot1dBaseBridgeAddress',
     'stp_i_time'      => 'dot1dStpTimeSinceTopologyChange',
     'stp_i_ntop'      => 'dot1dStpTopChanges',
     'stp_i_root'      => 'dot1dStpDesignatedRoot',
@@ -136,6 +137,7 @@ $VERSION = '3.20';
     'fw_mac'           => \&SNMP::Info::munge_mac,
     'bs_mac'           => \&SNMP::Info::munge_mac,
     'stp_root'         => \&SNMP::Info::munge_prio_mac,
+    'stp_i_mac'        => \&SNMP::Info::munge_mac,
     'stp_i_root'       => \&SNMP::Info::munge_prio_mac,
     'stp_p_root'       => \&SNMP::Info::munge_prio_mac,
     'stp_p_bridge'     => \&SNMP::Info::munge_prio_mac,
diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm
index 2f122c6c..23799adf 100644
--- a/Info/Layer3/Foundry.pm
+++ b/Info/Layer3/Foundry.pm
@@ -124,7 +124,7 @@ $VERSION = '3.20';
 
     'ag_mod2_type' => \&SNMP::Info::munge_e_type,
     'ag_mod_type'  => \&SNMP::Info::munge_e_type,
-    'stp_i_mac'    => \&SNMP::Info::munge_prio_mac,
+    'stp_i_mac'    => \&SNMP::Info::munge_mac,
     'stp_i_root'   => \&SNMP::Info::munge_prio_mac,
     'stp_p_root'   => \&SNMP::Info::munge_prio_mac,
     'stp_p_bridge' => \&SNMP::Info::munge_prio_mac,
diff --git a/Info/RapidCity.pm b/Info/RapidCity.pm
index 280b13c9..b9f82179 100644
--- a/Info/RapidCity.pm
+++ b/Info/RapidCity.pm
@@ -167,6 +167,7 @@ $VERSION = '3.20';
 
     # From RAPID-CITY::rcStgTable
     'stp_i_id'        => 'rcStgId',
+    'stp_i_mac'       => 'rcStgBridgeAddress',
     'stp_i_time'      => 'rcStgTimeSinceTopologyChange',
     'stp_i_ntop'      => 'rcStgTopChanges',
     'stp_i_root'      => 'rcStgDesignatedRoot',
@@ -191,6 +192,7 @@ $VERSION = '3.20';
     'rc_vlan_members' => \&SNMP::Info::munge_port_list,
     'rc_vlan_no_join' => \&SNMP::Info::munge_port_list,
     'rc_mlt_ports'    => \&SNMP::Info::munge_port_list,
+    'stp_i_mac'       => \&SNMP::Info::munge_mac,
     'stp_i_root'      => \&SNMP::Info::munge_prio_mac,
     'stp_p_root'      => \&SNMP::Info::munge_prio_mac,
     'stp_p_bridge'    => \&SNMP::Info::munge_prio_mac,
@@ -755,11 +757,11 @@ sub i_bpduguard_enabled {
 }
 
 sub i_stp_state {
-    my $bridge  = shift;
-    my $partial = shift;
+    my $rapidcity = shift;
+    my $partial   = shift;
 
-    my $bp_index    = $bridge->bp_index($partial);
-    my $stp_p_state = $bridge->dot1dStpPortState($partial);
+    my $bp_index    = $rapidcity->bp_index($partial);
+    my $stp_p_state = $rapidcity->dot1dStpPortState($partial);
 
     my %i_stp_state;