fix uniquify and a test for the new :name format