Changed my mind. Another renaming of functions