renaming of yorm functions/classes