change variable names to be consistent