Fixed variable names style