Changed variable names to new CFD terms