Further account for new variable naming.