Refs #5547 clarified some variable names
Merge branch 'bugfix/5547_waterfall_fill_incorrect' into develop