Renames s and s2 to something more meaningful