Fixed variable and function names.