Updating more function renames and coresponding tests.
Merge branch 'rename-again' into sew-devel-2_0