Account for new variable naming.