Changed variable and function names