rename lots of fuctions and variables