Fix variable names for YEPP