Use new names for popup fields