Fixed variable names to something more appropriate