Changed variable names to be consistent (instead of useful stuff).