Wrong device name in APM

Hello!

I want my devices in APM  to be named by their SNMP sysNames, e.g router. But APM sets their Name, SystemName from DNS, like router-gw.site.net. The DisplayName is set correctly to router.

I know that DNS is improperly configured for some network devices and not configured for others. How can I tell APM not to use DNS at all and set Name=SystemName=DisplayName=SNMP sysName (router)?

My settings:

$ cat local/conf/discovery/name-resolve.conf:

..

AutoNameOrder 0 TM_USESYSNAME
AutoNameOrder 1 TM_USELOOPBACK
AutoNameOrder 2 TM_USENONPRIVATEIP
AutoNameOrder 3 TM_USEPRIVATEIP
AutoNameOrder 4 TM_USEAGENTADDRESS

$ cat local/conf/discovery/discovery.conf | grep MIBII

DisplayNameFormat = "MIBIISYSNAME"

When I commented out all AutoNameOrder strings except the one with TM_USESYSNAME, APM sets Name=10.0.0.1, DisplayName=router.