Handle DM names properly in more cases