change variable and function names