Only use set display name if persistant names is set to true
Incorrect fix for NMS changes