Attempt fix for duplicate name-o-matic