diff --git a/opal/util/if.c b/opal/util/if.c
index da7bba70c0..dc3b73ea47 100644
--- a/opal/util/if.c
+++ b/opal/util/if.c
@@ -395,7 +395,7 @@ int opal_ifindextomask(int if_index, uint32_t* if_mask, int length)
  *  MAC assigned to the interface.
  */
 
-int btl_usnic_opal_ifindextomac(int if_index, uint8_t mac[6])
+int opal_ifindextomac(int if_index, uint8_t mac[6])
 {
     opal_if_t* intf;
 
@@ -415,7 +415,7 @@ int btl_usnic_opal_ifindextomac(int if_index, uint8_t mac[6])
  *  MTU assigned to the interface.
  */
 
-int btl_usnic_opal_ifindextomtu(int if_index, int *if_mtu)
+int opal_ifindextomtu(int if_index, int *if_mtu)
 {
     opal_if_t* intf;
 
diff --git a/opal/util/if.h b/opal/util/if.h
index 60b373cd14..9c99b51bcb 100644
--- a/opal/util/if.h
+++ b/opal/util/if.h
@@ -161,7 +161,7 @@ OPAL_DECLSPEC int opal_ifindextomask(int if_index, uint32_t*, int);
  *  @param if_index (IN)  Interface index
  *  @param if_mac (OUT)   Interface's MAC address
  */
-OPAL_DECLSPEC int btl_usnic_opal_ifindextomac(int if_index, uint8_t if_mac[6]);
+OPAL_DECLSPEC int opal_ifindextomac(int if_index, uint8_t if_mac[6]);
 
 /**
  *  Lookup an interface by index and return its MTU.
@@ -169,7 +169,7 @@ OPAL_DECLSPEC int btl_usnic_opal_ifindextomac(int if_index, uint8_t if_mac[6]);
  *  @param if_index (IN)  Interface index
  *  @param if_mtu (OUT)   Interface's MTU
  */
-OPAL_DECLSPEC int btl_usnic_opal_ifindextomtu(int if_index, int *if_mtu);
+OPAL_DECLSPEC int opal_ifindextomtu(int if_index, int *if_mtu);
 
 /**
  *  Lookup an interface by index and return its flags.