OME and iDRAC Service Module, issues with Device Name

For my Gen 13 PowerEdge servers, I want to move away from installing OMSA agent, and doing OME discovery on both iDRAC and OMSA.

I understand that by installing the iDRAC Service Module 2.3 for ESXi or Windows, and running discovery on only the iDRAC, I should get more or less the same functionality as I had with OMSA.

However, after removing OMSA, installing iSM, rebooting, removing the device from OME, removing the discovery of OMSA, and re-running discovery and inventory on the iDRAC IP, the device is indeed added back into OMSA, but the Device Name is that of the iDRAC, and not the actual hostname of the server.

When i log on to the iDRAC I can see that it displays the actual hostname under System Host Name. 

So my question is then, why doesn't OME pickup the correct hostname and rather displays the iDRAC name?

OME 2.1.2635