Rename the two waterfall methods in the text (but still need to rename them in the figures).