More work on custom nicknames