Changes to variable names
Fixed merge errors