Renaming of analysis routines