Sugar: Don't define anything name-related, move to AddNames.Types