Updated some variable and function names